ignore_roi_if_buy_signal -> ignore_roi_if_enter_signal

freqtrade/configuration/deprecated_settings.py

@@ -77,8 +77,8 @@ def process_temporary_deprecated_settings(config: Dict[str, Any]) -> None:
                                None, 'sell_profit_only')
     process_deprecated_setting(config, 'ask_strategy', 'sell_profit_offset',
                                None, 'sell_profit_offset')
-    process_deprecated_setting(config, 'ask_strategy', 'ignore_roi_if_buy_signal',
-                               None, 'ignore_roi_if_buy_signal')
+    process_deprecated_setting(config, 'ask_strategy', 'ignore_roi_if_enter_signal',
+                               None, 'ignore_roi_if_enter_signal')
     process_deprecated_setting(config, 'ask_strategy', 'ignore_buying_expired_candle_after',
                                None, 'ignore_buying_expired_candle_after')
 
@@ -87,8 +87,8 @@ def process_temporary_deprecated_settings(config: Dict[str, Any]) -> None:
                             None, 'use_exit_signal')
     process_removed_setting(config, 'experimental', 'sell_profit_only',
                             None, 'sell_profit_only')
-    process_removed_setting(config, 'experimental', 'ignore_roi_if_buy_signal',
-                            None, 'ignore_roi_if_buy_signal')
+    process_removed_setting(config, 'experimental', 'ignore_roi_if_enter_signal',
+                            None, 'ignore_roi_if_enter_signal')
 
     if (config.get('edge', {}).get('enabled', False)
        and 'capital_available_percentage' in config.get('edge', {})):

freqtrade/constants.py

@@ -150,7 +150,7 @@ CONF_SCHEMA = {
         'use_exit_signal': {'type': 'boolean'},
         'sell_profit_only': {'type': 'boolean'},
         'sell_profit_offset': {'type': 'number'},
-        'ignore_roi_if_buy_signal': {'type': 'boolean'},
+        'ignore_roi_if_enter_signal': {'type': 'boolean'},
         'ignore_buying_expired_candle_after': {'type': 'number'},
         'trading_mode': {'type': 'string', 'enum': TRADING_MODES},
         'collateral_type': {'type': 'string', 'enum': COLLATERAL_TYPES},

freqtrade/freqtradebot.py

@@ -865,7 +865,7 @@ class FreqtradeBot(LoggingMixin):
 
         # TODO-lev: change to use_exit_signal, ignore_roi_if_enter_signal
         if (self.config.get('use_exit_signal', True) or
-                self.config.get('ignore_roi_if_buy_signal', False)):
+                self.config.get('ignore_roi_if_enter_signal', False)):
             analyzed_df, _ = self.dataprovider.get_analyzed_dataframe(trade.pair,
                                                                       self.strategy.timeframe)
 

freqtrade/optimize/optimize_reports.py

@@ -462,7 +462,7 @@ def generate_strategy_stats(btdata: Dict[str, DataFrame],
         'use_exit_signal': config['use_exit_signal'],
         'sell_profit_only': config['sell_profit_only'],
         'sell_profit_offset': config['sell_profit_offset'],
-        'ignore_roi_if_buy_signal': config['ignore_roi_if_buy_signal'],
+        'ignore_roi_if_enter_signal': config['ignore_roi_if_enter_signal'],
         **daily_stats,
         **trade_stats
     }

freqtrade/resolvers/strategy_resolver.py

@@ -93,7 +93,7 @@ class StrategyResolver(IResolver):
                       ("unfilledtimeout",                 None),
                       ("use_exit_signal",                 True),
                       ("sell_profit_only",                False),
-                      ("ignore_roi_if_buy_signal",        False),
+                      ("ignore_roi_if_enter_signal",        False),
                       ("sell_profit_offset",              0.0),
                       ("disable_dataframe_checks",        False),
                       ("ignore_buying_expired_candle_after",  0)

freqtrade/strategy/interface.py

@@ -104,7 +104,7 @@ class IStrategy(ABC, HyperStrategyMixin):
     use_exit_signal: bool
     sell_profit_only: bool
     sell_profit_offset: float
-    ignore_roi_if_buy_signal: bool
+    ignore_roi_if_enter_signal: bool
 
     # Number of seconds after which the candle will no longer result in a buy on expired candles
     ignore_buying_expired_candle_after: int = 0
@@ -780,7 +780,7 @@ class IStrategy(ABC, HyperStrategyMixin):
         current_profit = trade.calc_profit_ratio(current_rate)
 
         # if enter signal and ignore_roi is set, we don't need to evaluate min_roi.
-        roi_reached = (not (enter and self.ignore_roi_if_buy_signal)
+        roi_reached = (not (enter and self.ignore_roi_if_enter_signal)
                        and self.min_roi_reached(trade=trade, current_profit=current_profit,
                                                 current_time=date))
 

freqtrade/templates/base_strategy.py.j2

@@ -64,7 +64,7 @@ class {{ strategy }}(IStrategy):
     # These values can be overridden in the "ask_strategy" section in the config.
     use_exit_signal = True
     sell_profit_only = False
-    ignore_roi_if_buy_signal = False
+    ignore_roi_if_enter_signal = False
 
     # Number of candles the strategy requires before producing valid signals
     startup_candle_count: int = 30

freqtrade/templates/sample_short_strategy.py

@@ -69,7 +69,7 @@ class SampleShortStrategy(IStrategy):
     # These values can be overridden in the "ask_strategy" section in the config.
     use_exit_signal = True
     sell_profit_only = False
-    ignore_roi_if_buy_signal = False
+    ignore_roi_if_enter_signal = False
 
     # Number of candles the strategy requires before producing valid signals
     startup_candle_count: int = 30

freqtrade/templates/sample_strategy.py

@@ -70,7 +70,7 @@ class SampleStrategy(IStrategy):
     # These values can be overridden in the "ask_strategy" section in the config.
     use_exit_signal = True
     sell_profit_only = False
-    ignore_roi_if_buy_signal = False
+    ignore_roi_if_enter_signal = False
 
     # Number of candles the strategy requires before producing valid signals
     startup_candle_count: int = 30