CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-11-29 08:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix _now_is_time_to_refresh_trades so it checks for latest fetched trades

Browse Source
This commit is contained in:
Joe Schr
2024-05-08 15:08:25 +02:00
parent 69d098e265
commit 56b07386ae
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
freqtrade/exchange/exchange.py
View File

@@ -126,7 +126,6 @@ class Exchange:
# Holds last candle refreshed time of each pair
self._pairs_last_refresh_time: Dict[PairWithTimeframe, int] = {}
self._trades_last_refresh_time: Dict[PairWithTimeframe, int] = {}
# Timestamp of last markets refresh
self._last_markets_refresh: int = 0
@@ -2329,9 +2328,6 @@ class Exchange:
# keeping last candle time as last refreshed time of the pair
if ticks and cache:
idx = -1
# NOTE: // is floor: divides and rounds to nearest int
self._trades_last_refresh_time[
(pair, timeframe, c_type)] = trades_df['timestamp'].iat[idx] // 1000
if cache:
if (pair, timeframe, c_type) in self._trades:
@@ -2448,17 +2444,15 @@ class Exchange:
return results_df
def _now_is_time_to_refresh_trades(self,
pair: str,
timeframe: str,
candle_type: CandleType) -> bool:
# Timeframe in seconds
df = self.klines((pair, timeframe, candle_type), True)
_calculate_ohlcv_candle_start_and_end(df, timeframe)
timeframe_to_seconds(timeframe)
plr = round(df.iloc[-1]["candle_end"].timestamp())
now = int(timeframe_to_prev_date(timeframe).timestamp())
return plr < now
def _now_is_time_to_refresh_trades(
self, pair: str, timeframe: str, candle_type: CandleType
) -> bool: # Timeframe in seconds
trades = self.trades((pair, timeframe, candle_type), False)
pair_last_refreshed = int(trades.iloc[-1]["timestamp"])
full_candle = int(timeframe_to_next_date(
timeframe, dt_from_ts(pair_last_refreshed)).timestamp()) * 1000
now = dt_ts()
return full_candle <= now
# Fetch historic trades