diff --git a/freqtrade/configuration/arguments.py b/freqtrade/configuration/arguments.py index 937fe1a3c..646cdb2b7 100644 --- a/freqtrade/configuration/arguments.py +++ b/freqtrade/configuration/arguments.py @@ -35,7 +35,7 @@ ARGS_LIST_EXCHANGES = ["print_one_column", "list_exchanges_all"] ARGS_LIST_TIMEFRAMES = ["exchange", "print_one_column"] ARGS_LIST_PAIRS = ["exchange", "print_list", "list_pairs_print_json", "print_one_column", - "print_csv", "base_currencies", "quote_currencies", "active_only"] + "print_csv", "base_currencies", "quote_currencies", "list_pairs_all"] ARGS_CREATE_USERDIR = ["user_data_dir"] diff --git a/freqtrade/configuration/cli_options.py b/freqtrade/configuration/cli_options.py index ab3f4f00a..926824cf4 100644 --- a/freqtrade/configuration/cli_options.py +++ b/freqtrade/configuration/cli_options.py @@ -256,6 +256,12 @@ AVAILABLE_CLI_OPTIONS = { action='store_true', ), # List pairs / markets + "list_pairs_all": Arg( + '-a', '--all', + help='Print all pairs or market symbols. By default only active ' + 'ones are shown.', + action='store_true', + ), "print_list": Arg( '--print-list', help='Print list of pairs or market symbols. By default data is ' @@ -283,11 +289,6 @@ AVAILABLE_CLI_OPTIONS = { help='Specify base currency(-ies). Space-separated list.', nargs='+', ), - "active_only": Arg( - '--active-only', - help='Print only active pairs or markets.', - action='store_true', - ), # Script options "pairs": Arg( '-p', '--pairs', diff --git a/freqtrade/utils.py b/freqtrade/utils.py index b927d73bf..1e9aca647 100644 --- a/freqtrade/utils.py +++ b/freqtrade/utils.py @@ -136,7 +136,9 @@ def start_list_pairs(args: Dict[str, Any], pairs_only: bool = False) -> None: # # Init exchange exchange = ExchangeResolver(config['exchange']['name'], config).exchange - active_only = args.get('active_only', False) + # By default only active pairs/markets are to be shown + active_only = not args.get('list_pairs_all', False) + base_currencies = args.get('base_currencies', []) quote_currencies = args.get('quote_currencies', [])