CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2026-02-09 07:40:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

use last order date to fill order.

Browse Source
This commit is contained in:
Matthias
2023-09-12 07:01:51 +02:00
parent a866b0a35e
commit a52cf42218
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
freqtrade/persistence/trade_model.py
View File

@@ -433,13 +433,20 @@ class LocalTrade:
return self.amount
@property
def date_last_filled_utc(self) -> datetime:
def _date_last_filled_utc(self) -> Optional[datetime]:
""" Date of the last filled order"""
orders = self.select_filled_orders()
if not orders:
if orders:
return max(o.order_filled_utc for o in orders if o.order_filled_utc)
return None
@property
def date_last_filled_utc(self) -> datetime:
""" Date of the last filled order - or open_date if no orders are filled"""
dt_last_filled = self._date_last_filled_utc
if not dt_last_filled:
return self.open_date_utc
return max([self.open_date_utc,
max(o.order_filled_utc for o in orders if o.order_filled_utc)])
return max([self.open_date_utc, dt_last_filled])
@property
def open_date_utc(self):
@@ -775,7 +782,7 @@ class LocalTrade:
and marks trade as closed
"""
self.close_rate = rate
self.close_date = self.close_date or datetime.utcnow()
self.close_date = self.close_date or self._date_last_filled_utc or dt_now()
self.is_open = False
self.exit_order_status = 'closed'
self.recalc_trade_from_orders(is_closing=True)