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

Small fixes to align backtesting with live

Browse Source
This commit is contained in:
Matthias 2022-06-21 06:47:17 +02:00
parent 0bfb0febe9
commit 76907cb4d6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/freqtradebot.py
View File

@ -539,7 +539,8 @@ class FreqtradeBot(LoggingMixin):
logger.debug(f"Calling adjust_trade_position for pair {trade.pair}") logger.debug(f"Calling adjust_trade_position for pair {trade.pair}")
stake_amount = strategy_safe_wrapper(self.strategy.adjust_trade_position, stake_amount = strategy_safe_wrapper(self.strategy.adjust_trade_position,
default_retval=None)( default_retval=None)(
trade=trade, current_time=datetime.now(timezone.utc), current_rate=current_entry_rate, trade=trade,
current_time=datetime.now(timezone.utc), current_rate=current_entry_rate,
current_profit=current_entry_profit, min_stake=min_entry_stake, current_profit=current_entry_profit, min_stake=min_entry_stake,
max_stake=min(max_entry_stake, stake_available), max_stake=min(max_entry_stake, stake_available),
current_entry_rate=current_entry_rate, current_exit_rate=current_exit_rate, current_entry_rate=current_entry_rate, current_exit_rate=current_exit_rate,

4
freqtrade/optimize/backtesting.py
View File

@ -522,8 +522,8 @@ class Backtesting:
if stake_amount is not None and stake_amount < 0.0: if stake_amount is not None and stake_amount < 0.0:
amount = abs(stake_amount) / current_rate amount = abs(stake_amount) / current_rate
if amount > trade.amount: if amount > trade.amount:
# selling more than available is not supported. # This is currently ineffective as remaining would become < min tradable
return trade amount = trade.amount
remaining = (trade.amount - amount) * current_rate remaining = (trade.amount - amount) * current_rate
if remaining < min_stake: if remaining < min_stake:
# Remaining stake is too low to be sold. # Remaining stake is too low to be sold.