Merge branch 'develop' into pr/samgermain/6558

freqtrade/commands/cli_options.py

@@ -5,6 +5,7 @@ from argparse import SUPPRESS, ArgumentTypeError
 
 from freqtrade import __version__, constants
 from freqtrade.constants import HYPEROPT_LOSS_BUILTIN
+from freqtrade.enums import CandleType
 
 
 def check_int_positive(value: str) -> int:
@@ -184,7 +185,6 @@ AVAILABLE_CLI_OPTIONS = {
         '--export',
         help='Export backtest results (default: trades).',
         choices=constants.EXPORT_OPTIONS,
-
     ),
     "exportfilename": Arg(
         "--export-filename",
@@ -361,6 +361,17 @@ AVAILABLE_CLI_OPTIONS = {
         nargs='+',
         metavar='BASE_CURRENCY',
     ),
+    "trading_mode": Arg(
+        '--trading-mode',
+        help='Select Trading mode',
+        choices=constants.TRADING_MODES,
+    ),
+    "candle_types": Arg(
+        '--candle-types',
+        help='Select candle type to use',
+        choices=[c.value for c in CandleType],
+        nargs='+',
+    ),
     # Script options
     "pairs": Arg(
         '-p', '--pairs',