From 0293a618959969fb076bdcd778f96944e150adfa Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 12 Mar 2019 19:37:43 +0100 Subject: [PATCH 1/3] Update documentation for minimal_roi, which is not really optional --- docs/configuration.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index d7e774595..2d5c958bb 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -118,9 +118,10 @@ See the example below: }, ``` -Most of the strategy files already include the optimal `minimal_roi` -value. This parameter is optional. If you use it in the configuration file, it will take over the +Most of the strategy files already include the optimal `minimal_roi` value. +This parameter can be set in either Strategy or Configuration file. If you use it in the configuration file, it will override the `minimal_roi` value from the strategy file. +If it is not set in either Strategy or Configuration, a default of 1000% `{"0": 10}` is used, and minimal roi is disabled unless your trade generates 1000% profit. ### Understand stoploss From 94b2d48d02f6c451dfc0d0c0a6a3777d6283e8bc Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 12 Mar 2019 19:37:58 +0100 Subject: [PATCH 2/3] Add default value for minimal_roi (1000%) fix #1633 --- freqtrade/resolvers/strategy_resolver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freqtrade/resolvers/strategy_resolver.py b/freqtrade/resolvers/strategy_resolver.py index c49da9205..8e582d09c 100644 --- a/freqtrade/resolvers/strategy_resolver.py +++ b/freqtrade/resolvers/strategy_resolver.py @@ -46,7 +46,7 @@ class StrategyResolver(IResolver): # Set attributes # Check if we need to override configuration # (Attribute name, default, experimental) - attributes = [("minimal_roi", None, False), + attributes = [("minimal_roi", {"0": 10.0}, False), ("ticker_interval", None, False), ("stoploss", None, False), ("trailing_stop", None, False), From ff9231eec484bc4d12fa24e27551f243dd20875b Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 14 Mar 2019 06:42:27 +0100 Subject: [PATCH 3/3] Format attributes-table --- freqtrade/resolvers/strategy_resolver.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/freqtrade/resolvers/strategy_resolver.py b/freqtrade/resolvers/strategy_resolver.py index 8e582d09c..9d9d59a4a 100644 --- a/freqtrade/resolvers/strategy_resolver.py +++ b/freqtrade/resolvers/strategy_resolver.py @@ -46,18 +46,18 @@ class StrategyResolver(IResolver): # Set attributes # Check if we need to override configuration # (Attribute name, default, experimental) - attributes = [("minimal_roi", {"0": 10.0}, False), - ("ticker_interval", None, False), - ("stoploss", None, False), - ("trailing_stop", None, False), - ("trailing_stop_positive", None, False), - ("trailing_stop_positive_offset", 0.0, False), - ("process_only_new_candles", None, False), - ("order_types", None, False), - ("order_time_in_force", None, False), - ("use_sell_signal", False, True), - ("sell_profit_only", False, True), - ("ignore_roi_if_buy_signal", False, True), + attributes = [("minimal_roi", {"0": 10.0}, False), + ("ticker_interval", None, False), + ("stoploss", None, False), + ("trailing_stop", None, False), + ("trailing_stop_positive", None, False), + ("trailing_stop_positive_offset", 0.0, False), + ("process_only_new_candles", None, False), + ("order_types", None, False), + ("order_time_in_force", None, False), + ("use_sell_signal", False, True), + ("sell_profit_only", False, True), + ("ignore_roi_if_buy_signal", False, True), ] for attribute, default, experimental in attributes: if experimental: