From 66551e0f58e57077986dc1086bc28d95c481d24e Mon Sep 17 00:00:00 2001 From: Ruben Cancho <304053+Canx@users.noreply.github.com> Date: Sun, 5 Jan 2025 09:31:54 +0100 Subject: [PATCH 1/9] Added test for adjust_trade_position --- tests/unit/test_NFIX5.py | 71 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/tests/unit/test_NFIX5.py b/tests/unit/test_NFIX5.py index 3d8a88be05..7ec769376c 100644 --- a/tests/unit/test_NFIX5.py +++ b/tests/unit/test_NFIX5.py @@ -1,7 +1,7 @@ import pytest +from unittest.mock import MagicMock from NostalgiaForInfinityX5 import NostalgiaForInfinityX5 - @pytest.fixture def mock_config(tmp_path): class RunModeMock: @@ -28,6 +28,75 @@ def __init__(self, value): "runmode": RunModeMock("backtest"), # Simulate the execution mode } +# Define a mock trade object +class MockTrade: + def __init__(self, is_short, enter_tag): + self.is_short = is_short + self.enter_tag = enter_tag + +@pytest.mark.parametrize( + "trade, enter_tags, expected_function", + [ + (MockTrade(False, "61"), ["61"], "long_rebuy_adjust_trade_position"), # Rebuy + (MockTrade(False, "120"), ["120"], "long_grind_adjust_trade_position"), # Grind + (MockTrade(True, "620"), ["620"], "short_grind_adjust_trade_position"), # Short Grind + (MockTrade(False, "999"), ["999"], None), # No match + (MockTrade(False, ""), [], None), # Empty enter_tags + ], +) + +def test_adjust_trade_position(mock_config, mocker, trade, enter_tags, expected_function): + """Test that adjust_trade_position calls the correct function.""" + strategy = NostalgiaForInfinityX5(mock_config) + strategy.position_adjustment_enable = True + + # Mock adjustment functions + strategy.long_rebuy_adjust_trade_position = mocker.MagicMock() + strategy.long_grind_adjust_trade_position = mocker.MagicMock() + strategy.short_grind_adjust_trade_position = mocker.MagicMock() + + # Call adjust_trade_position + strategy.adjust_trade_position( + trade, + current_time=None, + current_rate=0.0, + current_profit=0.0, + min_stake=None, + max_stake=10.0, + current_entry_rate=0.0, + current_exit_rate=0.0, + current_entry_profit=0.0, + current_exit_profit=0.0, + ) + + # Verify correct function call + if expected_function: + getattr(strategy, expected_function).assert_called_once_with( + trade, + enter_tags, + None, + 0.0, + 0.0, + None, + 10.0, + 0.0, + 0.0, + 0.0, + 0.0, + ) + else: + called_functions = [] + for func_name, func in [ + ("long_rebuy_adjust_trade_position", strategy.long_rebuy_adjust_trade_position), + ("long_grind_adjust_trade_position", strategy.long_grind_adjust_trade_position), + ("short_grind_adjust_trade_position", strategy.short_grind_adjust_trade_position), + ]: + if func.called: + called_functions.append(f"{func_name} called with: {func.call_args_list}") + + if called_functions: + pytest.fail(f"Unexpected function calls: {called_functions}") + def test_update_signals_from_config(mock_config): """Test that the update_signals_from_config function correctly updates signals""" From 5087b801d5179888843f5dae95c2360f88fb5dbd Mon Sep 17 00:00:00 2001 From: Ruben Cancho <304053+Canx@users.noreply.github.com> Date: Sun, 5 Jan 2025 14:51:00 +0100 Subject: [PATCH 2/9] Added more tag combinations --- tests/unit/test_NFIX5.py | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/tests/unit/test_NFIX5.py b/tests/unit/test_NFIX5.py index 7ec769376c..515f697c94 100644 --- a/tests/unit/test_NFIX5.py +++ b/tests/unit/test_NFIX5.py @@ -23,7 +23,7 @@ def __init__(self, value): "stake_amount": 10, "dry_run": True, "timeframe": "5m", - "max_open_trades": 5, + "max_open_trades": 10, "user_data_dir": tmp_path, # Use pytest's temporary directory "runmode": RunModeMock("backtest"), # Simulate the execution mode } @@ -37,11 +37,30 @@ def __init__(self, is_short, enter_tag): @pytest.mark.parametrize( "trade, enter_tags, expected_function", [ - (MockTrade(False, "61"), ["61"], "long_rebuy_adjust_trade_position"), # Rebuy - (MockTrade(False, "120"), ["120"], "long_grind_adjust_trade_position"), # Grind - (MockTrade(True, "620"), ["620"], "short_grind_adjust_trade_position"), # Short Grind - (MockTrade(False, "999"), ["999"], None), # No match - (MockTrade(False, ""), [], None), # Empty enter_tags + # Rebuy and grind only tags + (MockTrade(False, "61"), ["61"], "long_rebuy_adjust_trade_position"), # Long rebuy tag + (MockTrade(False, "120"), ["120"], "long_grind_adjust_trade_position"), # Long grind tag + + # Other tags + (MockTrade(True, "620"), ["620"], "short_grind_adjust_trade_position"), # Short grind tag + (MockTrade(False, "161"), ["161"], "long_grind_adjust_trade_position"), # Long derisk tag + (MockTrade(False, "6"), ["6"], "long_grind_adjust_trade_position"), # Long normal tag + (MockTrade(False, "81"), ["81"], "long_grind_adjust_trade_position"), # Long high profit tag + (MockTrade(False, "41"), ["41"], "long_grind_adjust_trade_position"), # Long quick tag + (MockTrade(False, "101"), ["101"], "long_grind_adjust_trade_position"), # Long rapid tag + (MockTrade(False, "141"), ["141"], "long_grind_adjust_trade_position"), # Long top coins tag + (MockTrade(False, "999"), ["999"], "long_grind_adjust_trade_position"), # Long unkown tag + + # Rebuy + grind tags + (MockTrade(False, "61 120"), ["61", "120"], "long_rebuy_adjust_trade_position"), # Long rebuy + long grind tags + (MockTrade(False, "120 61"), ["120", "61"], "long_rebuy_adjust_trade_position"), # Long grind + long rebuy tags + + # (Rebuy or grind) + other tags + (MockTrade(False, "120 6"), ["120", "6"], "long_grind_adjust_trade_position"), # Long grind + long normal tag + (MockTrade(False, "61 6"), ["61", "6"], "long_grind_adjust_trade_position"), # Long rebuy + long normal tag + + # No tags! + (MockTrade(False, ""), [], "long_rebuy_adjust_trade_position"), # Empty enter_tags ], ) From 1083a5d7d199fe7f3ef76e5168e88bab12266f18 Mon Sep 17 00:00:00 2001 From: Ruben Cancho <304053+Canx@users.noreply.github.com> Date: Sun, 5 Jan 2025 15:10:19 +0100 Subject: [PATCH 3/9] No need repeating tags --- tests/unit/test_NFIX5.py | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/tests/unit/test_NFIX5.py b/tests/unit/test_NFIX5.py index 515f697c94..6bcf02ba53 100644 --- a/tests/unit/test_NFIX5.py +++ b/tests/unit/test_NFIX5.py @@ -35,36 +35,35 @@ def __init__(self, is_short, enter_tag): self.enter_tag = enter_tag @pytest.mark.parametrize( - "trade, enter_tags, expected_function", + "trade, expected_function", [ # Rebuy and grind only tags - (MockTrade(False, "61"), ["61"], "long_rebuy_adjust_trade_position"), # Long rebuy tag - (MockTrade(False, "120"), ["120"], "long_grind_adjust_trade_position"), # Long grind tag + (MockTrade(False, "61"), "long_rebuy_adjust_trade_position"), # Long rebuy tag + (MockTrade(False, "120"), "long_grind_adjust_trade_position"), # Long grind tag # Other tags - (MockTrade(True, "620"), ["620"], "short_grind_adjust_trade_position"), # Short grind tag - (MockTrade(False, "161"), ["161"], "long_grind_adjust_trade_position"), # Long derisk tag - (MockTrade(False, "6"), ["6"], "long_grind_adjust_trade_position"), # Long normal tag - (MockTrade(False, "81"), ["81"], "long_grind_adjust_trade_position"), # Long high profit tag - (MockTrade(False, "41"), ["41"], "long_grind_adjust_trade_position"), # Long quick tag - (MockTrade(False, "101"), ["101"], "long_grind_adjust_trade_position"), # Long rapid tag - (MockTrade(False, "141"), ["141"], "long_grind_adjust_trade_position"), # Long top coins tag - (MockTrade(False, "999"), ["999"], "long_grind_adjust_trade_position"), # Long unkown tag + (MockTrade(True, "620"), "short_grind_adjust_trade_position"), # Short grind tag + (MockTrade(False, "161"), "long_grind_adjust_trade_position"), # Long derisk tag + (MockTrade(False, "6"), "long_grind_adjust_trade_position"), # Long normal tag + (MockTrade(False, "81"), "long_grind_adjust_trade_position"), # Long high profit tag + (MockTrade(False, "41"), "long_grind_adjust_trade_position"), # Long quick tag + (MockTrade(False, "101"), "long_grind_adjust_trade_position"), # Long rapid tag + (MockTrade(False, "141"), "long_grind_adjust_trade_position"), # Long top coins tag + (MockTrade(False, "999"), "long_grind_adjust_trade_position"), # Long unknown tag # Rebuy + grind tags - (MockTrade(False, "61 120"), ["61", "120"], "long_rebuy_adjust_trade_position"), # Long rebuy + long grind tags - (MockTrade(False, "120 61"), ["120", "61"], "long_rebuy_adjust_trade_position"), # Long grind + long rebuy tags + (MockTrade(False, "61 120"), "long_rebuy_adjust_trade_position"), # Long rebuy + long grind tags + (MockTrade(False, "120 61"), "long_rebuy_adjust_trade_position"), # Long grind + long rebuy tags # (Rebuy or grind) + other tags - (MockTrade(False, "120 6"), ["120", "6"], "long_grind_adjust_trade_position"), # Long grind + long normal tag - (MockTrade(False, "61 6"), ["61", "6"], "long_grind_adjust_trade_position"), # Long rebuy + long normal tag + (MockTrade(False, "120 6"), "long_grind_adjust_trade_position"), # Long grind + long normal tag + (MockTrade(False, "61 6"), "long_grind_adjust_trade_position"), # Long rebuy + long normal tag # No tags! - (MockTrade(False, ""), [], "long_rebuy_adjust_trade_position"), # Empty enter_tags + (MockTrade(False, ""), "long_rebuy_adjust_trade_position"), # Empty enter_tags ], ) - -def test_adjust_trade_position(mock_config, mocker, trade, enter_tags, expected_function): +def test_adjust_trade_position(mock_config, mocker, trade, expected_function): """Test that adjust_trade_position calls the correct function.""" strategy = NostalgiaForInfinityX5(mock_config) strategy.position_adjustment_enable = True @@ -74,6 +73,9 @@ def test_adjust_trade_position(mock_config, mocker, trade, enter_tags, expected_ strategy.long_grind_adjust_trade_position = mocker.MagicMock() strategy.short_grind_adjust_trade_position = mocker.MagicMock() + # Derive enter_tags from trade.enter_tag + enter_tags = trade.enter_tag.split() + # Call adjust_trade_position strategy.adjust_trade_position( trade, From 415c6e7c30b71ed8a0f0244babbeafd51df46735 Mon Sep 17 00:00:00 2001 From: Ruben Cancho <304053+Canx@users.noreply.github.com> Date: Sun, 5 Jan 2025 15:25:06 +0100 Subject: [PATCH 4/9] No need for import --- tests/unit/test_NFIX5.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/test_NFIX5.py b/tests/unit/test_NFIX5.py index 6bcf02ba53..a07e6be6ad 100644 --- a/tests/unit/test_NFIX5.py +++ b/tests/unit/test_NFIX5.py @@ -1,5 +1,4 @@ import pytest -from unittest.mock import MagicMock from NostalgiaForInfinityX5 import NostalgiaForInfinityX5 @pytest.fixture From 09c6f02a082181839ac5c77dd78dbedcc2088c3f Mon Sep 17 00:00:00 2001 From: Ruben Cancho <304053+Canx@users.noreply.github.com> Date: Sun, 5 Jan 2025 15:34:56 +0100 Subject: [PATCH 5/9] Replaced 4 to 2 indentation --- tests/unit/test_NFIX5.py | 164 +++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/tests/unit/test_NFIX5.py b/tests/unit/test_NFIX5.py index a07e6be6ad..006a85603a 100644 --- a/tests/unit/test_NFIX5.py +++ b/tests/unit/test_NFIX5.py @@ -29,93 +29,93 @@ def __init__(self, value): # Define a mock trade object class MockTrade: - def __init__(self, is_short, enter_tag): - self.is_short = is_short - self.enter_tag = enter_tag + def __init__(self, is_short, enter_tag): + self.is_short = is_short + self.enter_tag = enter_tag @pytest.mark.parametrize( - "trade, expected_function", - [ - # Rebuy and grind only tags - (MockTrade(False, "61"), "long_rebuy_adjust_trade_position"), # Long rebuy tag - (MockTrade(False, "120"), "long_grind_adjust_trade_position"), # Long grind tag - - # Other tags - (MockTrade(True, "620"), "short_grind_adjust_trade_position"), # Short grind tag - (MockTrade(False, "161"), "long_grind_adjust_trade_position"), # Long derisk tag - (MockTrade(False, "6"), "long_grind_adjust_trade_position"), # Long normal tag - (MockTrade(False, "81"), "long_grind_adjust_trade_position"), # Long high profit tag - (MockTrade(False, "41"), "long_grind_adjust_trade_position"), # Long quick tag - (MockTrade(False, "101"), "long_grind_adjust_trade_position"), # Long rapid tag - (MockTrade(False, "141"), "long_grind_adjust_trade_position"), # Long top coins tag - (MockTrade(False, "999"), "long_grind_adjust_trade_position"), # Long unknown tag - - # Rebuy + grind tags - (MockTrade(False, "61 120"), "long_rebuy_adjust_trade_position"), # Long rebuy + long grind tags - (MockTrade(False, "120 61"), "long_rebuy_adjust_trade_position"), # Long grind + long rebuy tags - - # (Rebuy or grind) + other tags - (MockTrade(False, "120 6"), "long_grind_adjust_trade_position"), # Long grind + long normal tag - (MockTrade(False, "61 6"), "long_grind_adjust_trade_position"), # Long rebuy + long normal tag - - # No tags! - (MockTrade(False, ""), "long_rebuy_adjust_trade_position"), # Empty enter_tags - ], + "trade, expected_function", + [ + # Rebuy and grind only tags + (MockTrade(False, "61"), "long_rebuy_adjust_trade_position"), # Long rebuy tag + (MockTrade(False, "120"), "long_grind_adjust_trade_position"), # Long grind tag + + # Other tags + (MockTrade(True, "620"), "short_grind_adjust_trade_position"), # Short grind tag + (MockTrade(False, "161"), "long_grind_adjust_trade_position"), # Long derisk tag + (MockTrade(False, "6"), "long_grind_adjust_trade_position"), # Long normal tag + (MockTrade(False, "81"), "long_grind_adjust_trade_position"), # Long high profit tag + (MockTrade(False, "41"), "long_grind_adjust_trade_position"), # Long quick tag + (MockTrade(False, "101"), "long_grind_adjust_trade_position"), # Long rapid tag + (MockTrade(False, "141"), "long_grind_adjust_trade_position"), # Long top coins tag + (MockTrade(False, "999"), "long_grind_adjust_trade_position"), # Long unknown tag + + # Rebuy + grind tags + (MockTrade(False, "61 120"), "long_rebuy_adjust_trade_position"), # Long rebuy + long grind tags + (MockTrade(False, "120 61"), "long_rebuy_adjust_trade_position"), # Long grind + long rebuy tags + + # (Rebuy or grind) + other tags + (MockTrade(False, "120 6"), "long_grind_adjust_trade_position"), # Long grind + long normal tag + (MockTrade(False, "61 6"), "long_grind_adjust_trade_position"), # Long rebuy + long normal tag + + # No tags! + (MockTrade(False, ""), "long_rebuy_adjust_trade_position"), # Empty enter_tags + ], ) def test_adjust_trade_position(mock_config, mocker, trade, expected_function): - """Test that adjust_trade_position calls the correct function.""" - strategy = NostalgiaForInfinityX5(mock_config) - strategy.position_adjustment_enable = True - - # Mock adjustment functions - strategy.long_rebuy_adjust_trade_position = mocker.MagicMock() - strategy.long_grind_adjust_trade_position = mocker.MagicMock() - strategy.short_grind_adjust_trade_position = mocker.MagicMock() - - # Derive enter_tags from trade.enter_tag - enter_tags = trade.enter_tag.split() - - # Call adjust_trade_position - strategy.adjust_trade_position( - trade, - current_time=None, - current_rate=0.0, - current_profit=0.0, - min_stake=None, - max_stake=10.0, - current_entry_rate=0.0, - current_exit_rate=0.0, - current_entry_profit=0.0, - current_exit_profit=0.0, + """Test that adjust_trade_position calls the correct function.""" + strategy = NostalgiaForInfinityX5(mock_config) + strategy.position_adjustment_enable = True + + # Mock adjustment functions + strategy.long_rebuy_adjust_trade_position = mocker.MagicMock() + strategy.long_grind_adjust_trade_position = mocker.MagicMock() + strategy.short_grind_adjust_trade_position = mocker.MagicMock() + + # Derive enter_tags from trade.enter_tag + enter_tags = trade.enter_tag.split() + + # Call adjust_trade_position + strategy.adjust_trade_position( + trade, + current_time=None, + current_rate=0.0, + current_profit=0.0, + min_stake=None, + max_stake=10.0, + current_entry_rate=0.0, + current_exit_rate=0.0, + current_entry_profit=0.0, + current_exit_profit=0.0, + ) + + # Verify correct function call + if expected_function: + getattr(strategy, expected_function).assert_called_once_with( + trade, + enter_tags, + None, + 0.0, + 0.0, + None, + 10.0, + 0.0, + 0.0, + 0.0, + 0.0, ) - - # Verify correct function call - if expected_function: - getattr(strategy, expected_function).assert_called_once_with( - trade, - enter_tags, - None, - 0.0, - 0.0, - None, - 10.0, - 0.0, - 0.0, - 0.0, - 0.0, - ) - else: - called_functions = [] - for func_name, func in [ - ("long_rebuy_adjust_trade_position", strategy.long_rebuy_adjust_trade_position), - ("long_grind_adjust_trade_position", strategy.long_grind_adjust_trade_position), - ("short_grind_adjust_trade_position", strategy.short_grind_adjust_trade_position), - ]: - if func.called: - called_functions.append(f"{func_name} called with: {func.call_args_list}") - - if called_functions: - pytest.fail(f"Unexpected function calls: {called_functions}") + else: + called_functions = [] + for func_name, func in [ + ("long_rebuy_adjust_trade_position", strategy.long_rebuy_adjust_trade_position), + ("long_grind_adjust_trade_position", strategy.long_grind_adjust_trade_position), + ("short_grind_adjust_trade_position", strategy.short_grind_adjust_trade_position), + ]: + if func.called: + called_functions.append(f"{func_name} called with: {func.call_args_list}") + + if called_functions: + pytest.fail(f"Unexpected function calls: {called_functions}") def test_update_signals_from_config(mock_config): From d3fd9332319605e54eedf36f2cf82f3a4c1b4b13 Mon Sep 17 00:00:00 2001 From: Ruben Cancho <304053+Canx@users.noreply.github.com> Date: Sun, 5 Jan 2025 15:38:49 +0100 Subject: [PATCH 6/9] More styling --- tests/unit/test_NFIX5.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/unit/test_NFIX5.py b/tests/unit/test_NFIX5.py index 006a85603a..df2c3bb778 100644 --- a/tests/unit/test_NFIX5.py +++ b/tests/unit/test_NFIX5.py @@ -1,6 +1,7 @@ import pytest from NostalgiaForInfinityX5 import NostalgiaForInfinityX5 + @pytest.fixture def mock_config(tmp_path): class RunModeMock: @@ -27,19 +28,20 @@ def __init__(self, value): "runmode": RunModeMock("backtest"), # Simulate the execution mode } + # Define a mock trade object class MockTrade: def __init__(self, is_short, enter_tag): self.is_short = is_short self.enter_tag = enter_tag + @pytest.mark.parametrize( "trade, expected_function", [ # Rebuy and grind only tags (MockTrade(False, "61"), "long_rebuy_adjust_trade_position"), # Long rebuy tag (MockTrade(False, "120"), "long_grind_adjust_trade_position"), # Long grind tag - # Other tags (MockTrade(True, "620"), "short_grind_adjust_trade_position"), # Short grind tag (MockTrade(False, "161"), "long_grind_adjust_trade_position"), # Long derisk tag @@ -49,15 +51,12 @@ def __init__(self, is_short, enter_tag): (MockTrade(False, "101"), "long_grind_adjust_trade_position"), # Long rapid tag (MockTrade(False, "141"), "long_grind_adjust_trade_position"), # Long top coins tag (MockTrade(False, "999"), "long_grind_adjust_trade_position"), # Long unknown tag - # Rebuy + grind tags (MockTrade(False, "61 120"), "long_rebuy_adjust_trade_position"), # Long rebuy + long grind tags (MockTrade(False, "120 61"), "long_rebuy_adjust_trade_position"), # Long grind + long rebuy tags - # (Rebuy or grind) + other tags (MockTrade(False, "120 6"), "long_grind_adjust_trade_position"), # Long grind + long normal tag (MockTrade(False, "61 6"), "long_grind_adjust_trade_position"), # Long rebuy + long normal tag - # No tags! (MockTrade(False, ""), "long_rebuy_adjust_trade_position"), # Empty enter_tags ], From 13ee22a1ce16d9c816d9bd799f36c15a1f17a218 Mon Sep 17 00:00:00 2001 From: iterativ Date: Sun, 5 Jan 2025 11:50:14 +0200 Subject: [PATCH 7/9] X5: add global protection rule (Long). --- NostalgiaForInfinityX5.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/NostalgiaForInfinityX5.py b/NostalgiaForInfinityX5.py index 40b88c0bb9..6335adbe60 100644 --- a/NostalgiaForInfinityX5.py +++ b/NostalgiaForInfinityX5.py @@ -4297,6 +4297,24 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame: | (df["RSI_14_1d"] < 50.0) | (df["ROC_9_1d"] < 40.0) ) + # 15m & 1d down move, 15m & 1h & 4h still high, 1d still high & overbought + & ( + (df["RSI_3_15m"] > 35.0) + | (df["RSI_3_1d"] > 50.0) + | (df["RSI_14_15m"] < 45.0) + | (df["CCI_20_15m"] < -100.0) + | (df["STOCHRSIk_14_14_3_3_15m"] < 10.0) + | (df["RSI_14_1h"] < 45.0) + | (df["CCI_20_1h"] < -100.0) + | (df["STOCHRSIk_14_14_3_3_1h"] < 50.0) + | (df["RSI_14_4h"] < 45.0) + | (df["CCI_20_4h"] < -100.0) + | (df["STOCHRSIk_14_14_3_3_4h"] < 50.0) + | (df["RSI_14_1d"] < 50.0) + | (df["AROONU_14_1d"] < 50.0) + | (df["STOCHk_14_3_3_1d"] < 30.0) + | (df["ROC_9_1d"] < 50.0) + ) # 15m down move, 15m & 1h still high, 4h high & ( (df["RSI_3_15m"] > 35.0) @@ -5241,6 +5259,25 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame: | (df["STOCHRSIk_14_14_3_3_1d"] < 90.0) | (df["ROC_9_1d"] < 100.0) ) + # 1d P&D 15m & 1h & 4h down move, 15m & 1h & 4h still high, 1d still high & overbought + & ( + (df["change_pct_1d"] < 20.0) + | (df["top_wick_pct_1d"] < 20.0) + | (df["RSI_3_15m"] > 50.0) + | (df["RSI_3_1h"] > 50.0) + | (df["RSI_3_4h"] > 60.0) + | (df["RSI_14_15m"] < 40.0) + | (df["AROONU_14_15m"] < 50.0) + | (df["CCI_20_15m"] < -100.0) + | (df["RSI_14_1h"] < 40.0) + | (df["CCI_20_1h"] < -100.0) + | (df["RSI_14_4h"] < 50.0) + | (df["AROONU_14_4h"] < 75.0) + | (df["CCI_20_4h"] < -0.0) + | (df["STOCHRSIk_14_14_3_3_4h"] < 50.0) + | (df["RSI_14_1d"] < 60.0) + | (df["ROC_9_1d"] < 20.0) + ) # 1d green, 1h down move, 15m still not low enough, 1h still high, 4h & 1d high & overbought & ( (df["change_pct_1d"] < 30.0) From e2c0fa335c261a42d9cc96dc56c99c3dfd2bcc10 Mon Sep 17 00:00:00 2001 From: iterativ Date: Sun, 5 Jan 2025 15:17:38 +0200 Subject: [PATCH 8/9] Configs: blacklist FTM. --- configs/blacklist-binance.json | 2 +- configs/blacklist-bitget.json | 2 +- configs/blacklist-bitmart.json | 2 +- configs/blacklist-bitvavo.json | 2 +- configs/blacklist-bybit.json | 2 +- configs/blacklist-gateio.json | 2 +- configs/blacklist-htx.json | 2 +- configs/blacklist-hyperliquid.json | 2 +- configs/blacklist-kraken.json | 2 +- configs/blacklist-kucoin.json | 2 +- configs/blacklist-mexc.json | 2 +- configs/blacklist-okx.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/blacklist-binance.json b/configs/blacklist-binance.json index d2ce3aa647..6982ebe8c8 100644 --- a/configs/blacklist-binance.json +++ b/configs/blacklist-binance.json @@ -13,7 +13,7 @@ // FAN "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CHZ|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO)/.*", // Others - "(1EARTH|ILA|BOBA|CWAR|OMG|DMTR|MLS|TORN|LUNA|BTS|QKC|ACA|FTT|SRM|YFII|SNM|ANC|AION|MIR|WABI|QLC|NEBL|AUTO|VGX|DREP|PNT|PERL|LOOM|ID|NULS|TOMO|WTC|1000SATS|ORDI|XMR|ANT|MULTI|VAI|DREP|MOB|PNT|BTCDOM|WAVES|WNXM|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|ONDO|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|GFT|KEY|WRX|BLZ|DAR|TROY|STMX)/.*" + "(1EARTH|ILA|BOBA|CWAR|OMG|DMTR|MLS|TORN|LUNA|BTS|QKC|ACA|FTT|SRM|YFII|SNM|ANC|AION|MIR|WABI|QLC|NEBL|AUTO|VGX|DREP|PNT|PERL|LOOM|ID|NULS|TOMO|WTC|1000SATS|ORDI|XMR|ANT|MULTI|VAI|DREP|MOB|PNT|BTCDOM|WAVES|WNXM|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|ONDO|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|GFT|KEY|WRX|BLZ|DAR|TROY|STMX|FTM)/.*" ] } } diff --git a/configs/blacklist-bitget.json b/configs/blacklist-bitget.json index cfc49331b2..9380019634 100644 --- a/configs/blacklist-bitget.json +++ b/configs/blacklist-bitget.json @@ -12,7 +12,7 @@ // FAN Tokens "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PORTO|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO)/.*", // Other Coins - "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|KOK|DMTR|CHMB|CPOOL|MLS|RBS|SRBS|SYLO|VR|KARA|LUNA|SRBP|PSL|AI|QKC|EPK|BAX|UQC|ZBC|PLATO|ACA|XCN|MC|FTT|SRM|PRMX|SWP|XWG|PIAS|KICKS|TIME|WEMIX|HI.*|ALBT|ANC|CIX100|GLCH|MIR|CELT|TEM|ZKT|MVP|ADB|AXPR|H2O|FT|RLY|MARS4|DRGN|WXT|ROSN|KYL|FRR|STARLY|RBP|UNB|ARNM|NGC|CARE|REAP|EDG|GOM2|GRIN|INDI|LOVE|NGM|SHFT|ASTRA|SOLVE|SUKU|ECOX|PNT|BASIC|LMWR|VEGA|COCOS|PKF|SHX|DAPPT|BOB|ID|ZPAY|XHV|PCX|MODEFI|PEPE2|RFUEL|SIN|UBX|NOM|QUARTZ|XED|DG|SLCL|PLGR|OPCT|GMB|COV|TAUM|HAWK|LAVAX|CPC|AOA|EFX|FKX|JAR|NRG|REV|OXEN|LOC|IXS|FORESTPLUS|BNS|MNET|EQZ|LACE|VID|H3RO3S|2CRZ|RACEFI|WOM|DERO|MAKI|LTX|NULS|STRONG|ERSDL|KOL|COOHA|ROAR|SDL|CARD|BUY|CLUB|PLD|NDAU|PRIMAL|URUS|OMN|ARRR|ETN|SWINGBY|GENS|ACOIN|BUX|WAL|MOOV|AFK|LOCUS|PLY|DPX|GOVI|MNST|P00LS|SYNR|SOS|TOMO|KAT|PERL|1000SATS|SATS|ORDI|SOLS|DREP|WAVES|WNXM|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|ALITA|ANALOS|AWT|BLUE|BTCMEME|CAF|DONS|ETE|GQ|HMTT|IQ50|MOVEZ|PAW|PKEY|PORK|PPAD|PUMP|RED|RFD|SERP|SMOLE|SXS|SYNC|VOLT|VSTA|JENSEN|VGX|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|BMTC|MSN|HGP|OOFP|ZOOA|KMA|ZERO|ZEROLEND|GFT|KEY|GRAPE|EML|DAR|TROY|STMX)/.*" + "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|KOK|DMTR|CHMB|CPOOL|MLS|RBS|SRBS|SYLO|VR|KARA|LUNA|SRBP|PSL|AI|QKC|EPK|BAX|UQC|ZBC|PLATO|ACA|XCN|MC|FTT|SRM|PRMX|SWP|XWG|PIAS|KICKS|TIME|WEMIX|HI.*|ALBT|ANC|CIX100|GLCH|MIR|CELT|TEM|ZKT|MVP|ADB|AXPR|H2O|FT|RLY|MARS4|DRGN|WXT|ROSN|KYL|FRR|STARLY|RBP|UNB|ARNM|NGC|CARE|REAP|EDG|GOM2|GRIN|INDI|LOVE|NGM|SHFT|ASTRA|SOLVE|SUKU|ECOX|PNT|BASIC|LMWR|VEGA|COCOS|PKF|SHX|DAPPT|BOB|ID|ZPAY|XHV|PCX|MODEFI|PEPE2|RFUEL|SIN|UBX|NOM|QUARTZ|XED|DG|SLCL|PLGR|OPCT|GMB|COV|TAUM|HAWK|LAVAX|CPC|AOA|EFX|FKX|JAR|NRG|REV|OXEN|LOC|IXS|FORESTPLUS|BNS|MNET|EQZ|LACE|VID|H3RO3S|2CRZ|RACEFI|WOM|DERO|MAKI|LTX|NULS|STRONG|ERSDL|KOL|COOHA|ROAR|SDL|CARD|BUY|CLUB|PLD|NDAU|PRIMAL|URUS|OMN|ARRR|ETN|SWINGBY|GENS|ACOIN|BUX|WAL|MOOV|AFK|LOCUS|PLY|DPX|GOVI|MNST|P00LS|SYNR|SOS|TOMO|KAT|PERL|1000SATS|SATS|ORDI|SOLS|DREP|WAVES|WNXM|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|ALITA|ANALOS|AWT|BLUE|BTCMEME|CAF|DONS|ETE|GQ|HMTT|IQ50|MOVEZ|PAW|PKEY|PORK|PPAD|PUMP|RED|RFD|SERP|SMOLE|SXS|SYNC|VOLT|VSTA|JENSEN|VGX|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|BMTC|MSN|HGP|OOFP|ZOOA|KMA|ZERO|ZEROLEND|GFT|KEY|GRAPE|EML|DAR|TROY|STMX|FTM)/.*" ] } } diff --git a/configs/blacklist-bitmart.json b/configs/blacklist-bitmart.json index 913b9d9845..392a0564ad 100644 --- a/configs/blacklist-bitmart.json +++ b/configs/blacklist-bitmart.json @@ -12,7 +12,7 @@ // FAN Tokens "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO|ARG)/.*", // Other Coins - "(AMPL|1EARTH|ILA|BOBA|CWAR|MEM|OMG|XYM|CARR|SGB|SKEY|KLV|KOK|DMTR|CPOOL|KRL|MLS|SB|CEL|WWY|PTS|TORN|BANK|SYLO|VR|DOME|LUNATOKEN|NFTY|EPK|ZBC|AZY|PLATO|ACA|XCN|FTT|SRM|BVT|SWP|YFII|XWG|PIAS|KICKS|TIME|WEMIX|ANC|MIR|CELT|ZKT|GRV|SMART|RLY|REP|DRGN|WXT|ROSN|KYL|FRR|LEMN|NEBL|AUTO|UNB|CARE|VGX|EDG|LOVE|SHFT|ASTRA|SUKU|CHO|LOOM|BTS|SVT|ORDI|SWRV|DAPPT|BOB|ID|ZPAY|PCX|PEPE2|SIN|NOM|WOM|NULS|KOL|RED|PRIMAL|ACN|OMN|SWINGBY|MOOV|DPX|SOS|TOMO|NXD|KAT|CGG|PEEL|SATS|ORDI|BERRY|SOLS|FORE|LEO|JAM|BETS|BOTTO|SEAT|XFI|GAGA|CLFI|MAP|HAN|LIF3|STRUMP|BVM|PINKNINJA|HANK|ANON|SPCT|LUCA|PPC|ABEL|WAVES|WNXM|QTK|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|TRUMP|CAVADA|SQUAD|STC|TIN|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|LFT|DOCK|POLS|DJT|FOG|FIGHT.*|TXA|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|PXT|MSN|NFM|OCB|MTMS|SBCC|USBT|SAVM|RFD|DSLA|HAKA|KMA|ALT|KNFT|ZERO|APES|BITBOARD|UNM|IRON|LB|EAI|SFT|HSF|CUN|GOKU|BABYNEIROBSC|FINEETH|ZENIX|CAT1|GFF|AIDEEPGAMES|HK|PROTON|INFI|BFC|STFY|MORPHA|KDAO|WRAT|STARD|WIN1|DPAW|PNS|MAYHEM|KISHKA|ZST|LAG|WIFCEO|KITEAI|KIM|POWERAI|UB|MRST|FAN|SPOL|MTPE|NRS|3KM|SMARTAI|GFT|KEY|KING|INFRA|WRX|BLZ|DAR|STMX)/.*" + "(AMPL|1EARTH|ILA|BOBA|CWAR|MEM|OMG|XYM|CARR|SGB|SKEY|KLV|KOK|DMTR|CPOOL|KRL|MLS|SB|CEL|WWY|PTS|TORN|BANK|SYLO|VR|DOME|LUNATOKEN|NFTY|EPK|ZBC|AZY|PLATO|ACA|XCN|FTT|SRM|BVT|SWP|YFII|XWG|PIAS|KICKS|TIME|WEMIX|ANC|MIR|CELT|ZKT|GRV|SMART|RLY|REP|DRGN|WXT|ROSN|KYL|FRR|LEMN|NEBL|AUTO|UNB|CARE|VGX|EDG|LOVE|SHFT|ASTRA|SUKU|CHO|LOOM|BTS|SVT|ORDI|SWRV|DAPPT|BOB|ID|ZPAY|PCX|PEPE2|SIN|NOM|WOM|NULS|KOL|RED|PRIMAL|ACN|OMN|SWINGBY|MOOV|DPX|SOS|TOMO|NXD|KAT|CGG|PEEL|SATS|ORDI|BERRY|SOLS|FORE|LEO|JAM|BETS|BOTTO|SEAT|XFI|GAGA|CLFI|MAP|HAN|LIF3|STRUMP|BVM|PINKNINJA|HANK|ANON|SPCT|LUCA|PPC|ABEL|WAVES|WNXM|QTK|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|TRUMP|CAVADA|SQUAD|STC|TIN|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|LFT|DOCK|POLS|DJT|FOG|FIGHT.*|TXA|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|PXT|MSN|NFM|OCB|MTMS|SBCC|USBT|SAVM|RFD|DSLA|HAKA|KMA|ALT|KNFT|ZERO|APES|BITBOARD|UNM|IRON|LB|EAI|SFT|HSF|CUN|GOKU|BABYNEIROBSC|FINEETH|ZENIX|CAT1|GFF|AIDEEPGAMES|HK|PROTON|INFI|BFC|STFY|MORPHA|KDAO|WRAT|STARD|WIN1|DPAW|PNS|MAYHEM|KISHKA|ZST|LAG|WIFCEO|KITEAI|KIM|POWERAI|UB|MRST|FAN|SPOL|MTPE|NRS|3KM|SMARTAI|GFT|KEY|KING|INFRA|WRX|BLZ|DAR|STMX|FTM)/.*" ] } } diff --git a/configs/blacklist-bitvavo.json b/configs/blacklist-bitvavo.json index 6116f01118..b7407d4c96 100644 --- a/configs/blacklist-bitvavo.json +++ b/configs/blacklist-bitvavo.json @@ -12,7 +12,7 @@ // FAN Tokens "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO|ARG)/.*", // Other Coins - "(AMPL|1EARTH|ILA|BOBA|CWAR|MEM|OMG|XYM|CARR|SGB|SKEY|KLV|KOK|DMTR|CPOOL|KRL|MLS|SB|CEL|WWY|PTS|TORN|BANK|SYLO|VR|DOME|LUNATOKEN|NFTY|EPK|ZBC|AZY|PLATO|ACA|XCN|FTT|SRM|BVT|SWP|YFII|XWG|PIAS|KICKS|TIME|WEMIX|ANC|MIR|CELT|ZKT|GRV|SMART|RLY|REP|DRGN|WXT|ROSN|KYL|FRR|LEMN|QLC|NEBL|AUTO|CARE|REAP|VGX|TEM|EDG|GRIN|INDI|SHFT|ASTRA|STIK|SUKU|NSDX|CHO|ECOX|DREP|PNT|PERL|BTS|LADYS|SVT|ORDI|SWRV|LMWR|FIC|VEGA|PKF|SHX|ID|PCX|RFUEL|SIN|NOM|XED|DG|WOM|SNM|NULS|STRONG|BUY|RED|PRIMAL|ACN|MOVEZ|URUS|OMN|ARRR|GENS|QANX|MOOV|GOVI|SOS|TOMO|NXD|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|CTXC|JASMY|CVX|BAL|SUN|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP)/.*" + "(AMPL|1EARTH|ILA|BOBA|CWAR|MEM|OMG|XYM|CARR|SGB|SKEY|KLV|KOK|DMTR|CPOOL|KRL|MLS|SB|CEL|WWY|PTS|TORN|BANK|SYLO|VR|DOME|LUNATOKEN|NFTY|EPK|ZBC|AZY|PLATO|ACA|XCN|FTT|SRM|BVT|SWP|YFII|XWG|PIAS|KICKS|TIME|WEMIX|ANC|MIR|CELT|ZKT|GRV|SMART|RLY|REP|DRGN|WXT|ROSN|KYL|FRR|LEMN|QLC|NEBL|AUTO|CARE|REAP|VGX|TEM|EDG|GRIN|INDI|SHFT|ASTRA|STIK|SUKU|NSDX|CHO|ECOX|DREP|PNT|PERL|BTS|LADYS|SVT|ORDI|SWRV|LMWR|FIC|VEGA|PKF|SHX|ID|PCX|RFUEL|SIN|NOM|XED|DG|WOM|SNM|NULS|STRONG|BUY|RED|PRIMAL|ACN|MOVEZ|URUS|OMN|ARRR|GENS|QANX|MOOV|GOVI|SOS|TOMO|NXD|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|CTXC|JASMY|CVX|BAL|SUN|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|FTM)/.*" ] } } diff --git a/configs/blacklist-bybit.json b/configs/blacklist-bybit.json index 709ecf38a9..d752c51400 100644 --- a/configs/blacklist-bybit.json +++ b/configs/blacklist-bybit.json @@ -11,7 +11,7 @@ // FAN Tokens "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PORTO|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO)/.*", // Other Coins - "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|DMTR|MLS|XCN|FTT|SRM|MIR|ECOX|LADYS|BOB|ID|PEPE2|PRIMAL|MOVEZ|OMN|PLY|DPX|SYNR|SOS|TOMO|ORDI|OMG|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|VGX|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|LFT|DOCK|POLS|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|AGLA|ZERO|GFT|KEY|GRAPE|BLZ|DAR|TROY|STMX)/.*" + "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|DMTR|MLS|XCN|FTT|SRM|MIR|ECOX|LADYS|BOB|ID|PEPE2|PRIMAL|MOVEZ|OMN|PLY|DPX|SYNR|SOS|TOMO|ORDI|OMG|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|VGX|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|LFT|DOCK|POLS|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|AGLA|ZERO|GFT|KEY|GRAPE|BLZ|DAR|TROY|STMX|FTM)/.*" ] } } diff --git a/configs/blacklist-gateio.json b/configs/blacklist-gateio.json index 805ceab3b4..f34f98af83 100644 --- a/configs/blacklist-gateio.json +++ b/configs/blacklist-gateio.json @@ -12,7 +12,7 @@ // FAN Tokens "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO|ARG)/.*", // Other Coins - "(AMPL|1EARTH|ILA|BOBA|CWAR|MEM|OMG|XYM|CARR|SGB|SKEY|KLV|KOK|DMTR|CPOOL|KRL|MLS|SB|CEL|WWY|PTS|TORN|BANK|SYLO|VR|DOME|LUNATOKEN|NFTY|EPK|ZBC|AZY|PLATO|ACA|XCN|FTT|SRM|BVT|SWP|YFII|XWG|PIAS|KICKS|TIME|WEMIX|ANC|MIR|CELT|ZKT|GRV|SMART|RLY|REP|DRGN|WXT|ROSN|KYL|FRR|LEMN|QLC|NEBL|AUTO|CARE|REAP|VGX|TEM|EDG|GRIN|INDI|SHFT|ASTRA|STIK|SUKU|NSDX|CHO|ECOX|DREP|PNT|PERL|BTS|LADYS|SVT|ORDI|SWRV|LMWR|FIC|VEGA|PKF|SHX|ID|PCX|RFUEL|SIN|NOM|XED|DG|WOM|SNM|NULS|STRONG|BUY|RED|PRIMAL|ACN|MOVEZ|URUS|OMN|ARRR|GENS|QANX|MOOV|GOVI|SOS|TOMO|NXD|KAT|SKU|LOCG|WSIENNA|IHC|POSI|CGG|FORM|DFA|FALCONS|SATS|ORDI|BERRY|SOLS|DREP|MOB|PNT|YFDAI|SOLR|XPLL|ASD|BVM|WAVES|WNXM|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|AIRTNT|PDEX|EGAME|SQUAD|STC|VLX|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|YLD|GAL|DOCK|POLS|FIGHT.*|PMON|RMRK|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|MSN|AGLA|NFM|USBT|SAVM|RFD|DSLA|KMA|NEER|KNFT|ZERO|ZEROLEND|WEST|NORD|IRON|CST|SFT|HSF|KITEAI|KIM|3KM|GFT|KEY|KING|INFRA|XCUR|SUTER|EML|WRX|BLZ|DAR|CRE|TROY|STMX)/.*" + "(AMPL|1EARTH|ILA|BOBA|CWAR|MEM|OMG|XYM|CARR|SGB|SKEY|KLV|KOK|DMTR|CPOOL|KRL|MLS|SB|CEL|WWY|PTS|TORN|BANK|SYLO|VR|DOME|LUNATOKEN|NFTY|EPK|ZBC|AZY|PLATO|ACA|XCN|FTT|SRM|BVT|SWP|YFII|XWG|PIAS|KICKS|TIME|WEMIX|ANC|MIR|CELT|ZKT|GRV|SMART|RLY|REP|DRGN|WXT|ROSN|KYL|FRR|LEMN|QLC|NEBL|AUTO|CARE|REAP|VGX|TEM|EDG|GRIN|INDI|SHFT|ASTRA|STIK|SUKU|NSDX|CHO|ECOX|DREP|PNT|PERL|BTS|LADYS|SVT|ORDI|SWRV|LMWR|FIC|VEGA|PKF|SHX|ID|PCX|RFUEL|SIN|NOM|XED|DG|WOM|SNM|NULS|STRONG|BUY|RED|PRIMAL|ACN|MOVEZ|URUS|OMN|ARRR|GENS|QANX|MOOV|GOVI|SOS|TOMO|NXD|KAT|SKU|LOCG|WSIENNA|IHC|POSI|CGG|FORM|DFA|FALCONS|SATS|ORDI|BERRY|SOLS|DREP|MOB|PNT|YFDAI|SOLR|XPLL|ASD|BVM|WAVES|WNXM|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|AIRTNT|PDEX|EGAME|SQUAD|STC|VLX|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|YLD|GAL|DOCK|POLS|FIGHT.*|PMON|RMRK|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|MSN|AGLA|NFM|USBT|SAVM|RFD|DSLA|KMA|NEER|KNFT|ZERO|ZEROLEND|WEST|NORD|IRON|CST|SFT|HSF|KITEAI|KIM|3KM|GFT|KEY|KING|INFRA|XCUR|SUTER|EML|WRX|BLZ|DAR|CRE|TROY|STMX|FTM)/.*" ] } } diff --git a/configs/blacklist-htx.json b/configs/blacklist-htx.json index 1185c35552..13792ed813 100644 --- a/configs/blacklist-htx.json +++ b/configs/blacklist-htx.json @@ -12,7 +12,7 @@ // FAN Tokens "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PORTO|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO|ARG)/.*", // Other Coins - "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|DMTR|MLS|CEL|WWY|VR|LUNA|ZBC|PLATO|ACA|XCN|FTT|SRM|YFII|WEMIX|MIR|STARLY|ID|BERRY|XFI|WAVES|WNXM|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|STC|VLX|TRUMP|FIGHT.*|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|MSN|ZERO|ZEROLEND|HSF|GFT|KEY|KICKS|BLZ)/.*" + "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|DMTR|MLS|CEL|WWY|VR|LUNA|ZBC|PLATO|ACA|XCN|FTT|SRM|YFII|WEMIX|MIR|STARLY|ID|BERRY|XFI|WAVES|WNXM|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|STC|VLX|TRUMP|FIGHT.*|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|MSN|ZERO|ZEROLEND|HSF|GFT|KEY|KICKS|BLZ|FTM)/.*" ] } } diff --git a/configs/blacklist-hyperliquid.json b/configs/blacklist-hyperliquid.json index 4d5d012144..6c965a48a3 100644 --- a/configs/blacklist-hyperliquid.json +++ b/configs/blacklist-hyperliquid.json @@ -11,7 +11,7 @@ // FAN Tokens "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO|ARG)/.*", // Other Coins - "(AMPL|1EARTH|ILA|BOBA|CWAR|MEM|OMG|XYM|CARR|SGB|SKEY|KLV|KOK|DMTR|CPOOL|KRL|MLS|SB|CEL|WWY|PTS|TORN|BANK|SYLO|VR|DOME|LUNATOKEN|NFTY|EPK|ZBC|AZY|PLATO|ACA|XCN|FTT|SRM|BVT|SWP|YFII|XWG|PIAS|KICKS|TIME|WEMIX|ANC|MIR|CELT|ZKT|GRV|SMART|RLY|REP|DRGN|WXT|ROSN|KYL|FRR|LEMN|NEBL|AUTO|UNB|CARE|VGX|EDG|LOVE|SHFT|ASTRA|SUKU|CHO|LOOM|BTS|SVT|ORDI|SWRV|DAPPT|BOB|ID|ZPAY|PCX|PEPE2|SIN|NOM|WOM|NULS|KOL|RED|PRIMAL|ACN|OMN|SWINGBY|MOOV|DPX|SOS|TOMO|NXD|KAT|CGG|PEEL|SATS|ORDI|BERRY|SOLS|FORE|LEO|JAM|BETS|BOTTO|SEAT|XFI|GAGA|CLFI|MAP|HAN|LIF3|STRUMP|BVM|PINKNINJA|HANK|ANON|SPCT|LUCA|PPC|ABEL|WAVES|WNXM|QTK|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|TRUMP|CAVADA|SQUAD|STC|TIN|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|LFT|DOCK|POLS|DJT|FOG|FIGHT.*|TXA|CTXC|JASMY|CVX|BAL|SUN|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|PXT|MSN|NFM|OCB|MTMS|SBCC|USBT|SAVM|RFD|DSLA|HAKA|KMA|ALT|KNFT|ZERO|APES|BITBOARD|UNM|IRON|LB|EAI|SFT|HSF|CUN|GOKU|BABYNEIROBSC|FINEETH|ZENIX|CAT1|GFF|AIDEEPGAMES|HK|PROTON|INFI|BFC|STFY|MORPHA|KDAO|WRAT|STARD|WIN1|DPAW|PNS|MAYHEM|KISHKA|ZST|LAG|WIFCEO|KITEAI|KIM|POWERAI|UB|MRST|FAN|SPOL|MTPE|NRS|3KM|SMARTAI|GFT|KEY|KING|INFRA|EML|BLZ|DAR)/.*" + "(AMPL|1EARTH|ILA|BOBA|CWAR|MEM|OMG|XYM|CARR|SGB|SKEY|KLV|KOK|DMTR|CPOOL|KRL|MLS|SB|CEL|WWY|PTS|TORN|BANK|SYLO|VR|DOME|LUNATOKEN|NFTY|EPK|ZBC|AZY|PLATO|ACA|XCN|FTT|SRM|BVT|SWP|YFII|XWG|PIAS|KICKS|TIME|WEMIX|ANC|MIR|CELT|ZKT|GRV|SMART|RLY|REP|DRGN|WXT|ROSN|KYL|FRR|LEMN|NEBL|AUTO|UNB|CARE|VGX|EDG|LOVE|SHFT|ASTRA|SUKU|CHO|LOOM|BTS|SVT|ORDI|SWRV|DAPPT|BOB|ID|ZPAY|PCX|PEPE2|SIN|NOM|WOM|NULS|KOL|RED|PRIMAL|ACN|OMN|SWINGBY|MOOV|DPX|SOS|TOMO|NXD|KAT|CGG|PEEL|SATS|ORDI|BERRY|SOLS|FORE|LEO|JAM|BETS|BOTTO|SEAT|XFI|GAGA|CLFI|MAP|HAN|LIF3|STRUMP|BVM|PINKNINJA|HANK|ANON|SPCT|LUCA|PPC|ABEL|WAVES|WNXM|QTK|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|TRUMP|CAVADA|SQUAD|STC|TIN|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|LFT|DOCK|POLS|DJT|FOG|FIGHT.*|TXA|CTXC|JASMY|CVX|BAL|SUN|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|PXT|MSN|NFM|OCB|MTMS|SBCC|USBT|SAVM|RFD|DSLA|HAKA|KMA|ALT|KNFT|ZERO|APES|BITBOARD|UNM|IRON|LB|EAI|SFT|HSF|CUN|GOKU|BABYNEIROBSC|FINEETH|ZENIX|CAT1|GFF|AIDEEPGAMES|HK|PROTON|INFI|BFC|STFY|MORPHA|KDAO|WRAT|STARD|WIN1|DPAW|PNS|MAYHEM|KISHKA|ZST|LAG|WIFCEO|KITEAI|KIM|POWERAI|UB|MRST|FAN|SPOL|MTPE|NRS|3KM|SMARTAI|GFT|KEY|KING|INFRA|EML|BLZ|DAR|FTM)/.*" ] } } diff --git a/configs/blacklist-kraken.json b/configs/blacklist-kraken.json index fa23c267b2..875b317ae3 100644 --- a/configs/blacklist-kraken.json +++ b/configs/blacklist-kraken.json @@ -10,7 +10,7 @@ // FAN Tokens "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PORTO|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO)/.*", // Other Coins - "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|KOK|DMTR|CHMB|CPOOL|MLS|RBS|SRBS|SYLO|VR|KARA|LUNA|SRBP|PSL|AI|QKC|EPK|BAX|UQC|ZBC|PLATO|ACA|XCN|MC|FTT|SRM|PRMX|SWP|XWG|PIAS|KICKS|TIME|WEMIX|HI.*|ALBT|ANC|CIX100|GLCH|MIR|CELT|TEM|ZKT|MVP|ADB|AXPR|H2O|FT|RLY|MARS4|DRGN|WXT|ROSN|KYL|FRR|STARLY|RBP|UNB|ARNM|NGC|CARE|REAP|EDG|GOM2|GRIN|INDI|LOVE|NGM|SHFT|ASTRA|SOLVE|SUKU|ECOX|PNT|BASIC|LMWR|VEGA|COCOS|PKF|SHX|DAPPT|BOB|ID|ZPAY|XHV|PCX|MODEFI|PEPE2|RFUEL|SIN|UBX|NOM|QUARTZ|XED|DG|SLCL|PLGR|OPCT|GMB|COV|TAUM|HAWK|LAVAX|CPC|AOA|EFX|FKX|JAR|NRG|REV|OXEN|LOC|IXS|FORESTPLUS|BNS|MNET|EQZ|LACE|VID|H3RO3S|2CRZ|RACEFI|WOM|DERO|WAVES|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|OCEAN|FET|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|RNDR|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|KEY|BLZ|DAR|TROY|STMX)/.*" + "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|KOK|DMTR|CHMB|CPOOL|MLS|RBS|SRBS|SYLO|VR|KARA|LUNA|SRBP|PSL|AI|QKC|EPK|BAX|UQC|ZBC|PLATO|ACA|XCN|MC|FTT|SRM|PRMX|SWP|XWG|PIAS|KICKS|TIME|WEMIX|HI.*|ALBT|ANC|CIX100|GLCH|MIR|CELT|TEM|ZKT|MVP|ADB|AXPR|H2O|FT|RLY|MARS4|DRGN|WXT|ROSN|KYL|FRR|STARLY|RBP|UNB|ARNM|NGC|CARE|REAP|EDG|GOM2|GRIN|INDI|LOVE|NGM|SHFT|ASTRA|SOLVE|SUKU|ECOX|PNT|BASIC|LMWR|VEGA|COCOS|PKF|SHX|DAPPT|BOB|ID|ZPAY|XHV|PCX|MODEFI|PEPE2|RFUEL|SIN|UBX|NOM|QUARTZ|XED|DG|SLCL|PLGR|OPCT|GMB|COV|TAUM|HAWK|LAVAX|CPC|AOA|EFX|FKX|JAR|NRG|REV|OXEN|LOC|IXS|FORESTPLUS|BNS|MNET|EQZ|LACE|VID|H3RO3S|2CRZ|RACEFI|WOM|DERO|WAVES|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|OCEAN|FET|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|RNDR|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|KEY|BLZ|DAR|TROY|STMX|FTM)/.*" ] } } diff --git a/configs/blacklist-kucoin.json b/configs/blacklist-kucoin.json index 30da40a649..da1b91654c 100644 --- a/configs/blacklist-kucoin.json +++ b/configs/blacklist-kucoin.json @@ -12,7 +12,7 @@ // FAN Tokens "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PORTO|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO)/.*", // Other Coins - "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|KOK|DMTR|CHMB|CPOOL|MLS|RBS|SRBS|SYLO|VR|KARA|LUNA|SRBP|PSL|AI|QKC|EPK|BAX|UQC|ZBC|PLATO|ACA|XCN|MC|FTT|SRM|PRMX|SWP|XWG|PIAS|KICKS|TIME|WEMIX|HI.*|ALBT|ANC|CIX100|GLCH|MIR|CELT|TEM|ZKT|MVP|ADB|AXPR|H2O|FT|RLY|MARS4|DRGN|WXT|ROSN|KYL|FRR|STARLY|RBP|UNB|ARNM|NGC|CARE|REAP|EDG|GOM2|GRIN|INDI|LOVE|NGM|SHFT|ASTRA|SOLVE|SUKU|ECOX|PNT|BASIC|LMWR|VEGA|COCOS|PKF|SHX|DAPPT|BOB|ID|ZPAY|XHV|PCX|MODEFI|PEPE2|RFUEL|SIN|UBX|NOM|QUARTZ|XED|DG|SLCL|PLGR|OPCT|GMB|COV|TAUM|HAWK|LAVAX|CPC|AOA|EFX|FKX|JAR|NRG|REV|OXEN|LOC|IXS|FORESTPLUS|BNS|MNET|EQZ|LACE|VID|H3RO3S|2CRZ|RACEFI|WOM|DERO|MAKI|LTX|NULS|STRONG|ERSDL|KOL|COOHA|ROAR|SDL|CARD|BUY|CLUB|PLD|NDAU|PRIMAL|URUS|OMN|ARRR|ETN|SWINGBY|GENS|ACOIN|BUX|WAL|MOOV|AFK|LOCUS|PLY|DPX|GOVI|MNST|P00LS|SYNR|SOS|ENQ|KAT|SKU|KDON|LOCG|WSIENNA|IHC|POSI|TONE|PIKA|KAR|ISLM|CGG|FORM|DFA|PEEL|VEED|FALCONS|SATS|ORDI|PHNX|ANT|SOLS|YFDAI|SOLR|XPLL|ASD|SHA|CMP|WAVES|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|PDEX|EGAME|SQUAD|STC|VLX|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|YLD|GAL|LFT|DOCK|POLS|TXA|PMON|FSN|RMRK|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|BMX|MSN|SAVM|RFD|DSLA|UTXO|HAKA|BOLT|HGP||KMA|OOFP|ZOOA|ETGM|ALT|NEER|ZERO|WEST|BIIS|NORD|IRON|GFT|KEY|KING|INFRA|GRAPE|XCUR|SUTER|WRX|BLZ|DAR)/.*" + "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|KOK|DMTR|CHMB|CPOOL|MLS|RBS|SRBS|SYLO|VR|KARA|LUNA|SRBP|PSL|AI|QKC|EPK|BAX|UQC|ZBC|PLATO|ACA|XCN|MC|FTT|SRM|PRMX|SWP|XWG|PIAS|KICKS|TIME|WEMIX|HI.*|ALBT|ANC|CIX100|GLCH|MIR|CELT|TEM|ZKT|MVP|ADB|AXPR|H2O|FT|RLY|MARS4|DRGN|WXT|ROSN|KYL|FRR|STARLY|RBP|UNB|ARNM|NGC|CARE|REAP|EDG|GOM2|GRIN|INDI|LOVE|NGM|SHFT|ASTRA|SOLVE|SUKU|ECOX|PNT|BASIC|LMWR|VEGA|COCOS|PKF|SHX|DAPPT|BOB|ID|ZPAY|XHV|PCX|MODEFI|PEPE2|RFUEL|SIN|UBX|NOM|QUARTZ|XED|DG|SLCL|PLGR|OPCT|GMB|COV|TAUM|HAWK|LAVAX|CPC|AOA|EFX|FKX|JAR|NRG|REV|OXEN|LOC|IXS|FORESTPLUS|BNS|MNET|EQZ|LACE|VID|H3RO3S|2CRZ|RACEFI|WOM|DERO|MAKI|LTX|NULS|STRONG|ERSDL|KOL|COOHA|ROAR|SDL|CARD|BUY|CLUB|PLD|NDAU|PRIMAL|URUS|OMN|ARRR|ETN|SWINGBY|GENS|ACOIN|BUX|WAL|MOOV|AFK|LOCUS|PLY|DPX|GOVI|MNST|P00LS|SYNR|SOS|ENQ|KAT|SKU|KDON|LOCG|WSIENNA|IHC|POSI|TONE|PIKA|KAR|ISLM|CGG|FORM|DFA|PEEL|VEED|FALCONS|SATS|ORDI|PHNX|ANT|SOLS|YFDAI|SOLR|XPLL|ASD|SHA|CMP|WAVES|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|PDEX|EGAME|SQUAD|STC|VLX|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|YLD|GAL|LFT|DOCK|POLS|TXA|PMON|FSN|RMRK|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|BMX|MSN|SAVM|RFD|DSLA|UTXO|HAKA|BOLT|HGP||KMA|OOFP|ZOOA|ETGM|ALT|NEER|ZERO|WEST|BIIS|NORD|IRON|GFT|KEY|KING|INFRA|GRAPE|XCUR|SUTER|WRX|BLZ|DAR|FTM)/.*" ] } } diff --git a/configs/blacklist-mexc.json b/configs/blacklist-mexc.json index 4bc253c791..7ddfd6c808 100644 --- a/configs/blacklist-mexc.json +++ b/configs/blacklist-mexc.json @@ -12,7 +12,7 @@ // FAN Tokens "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO|ARG)/.*", // Other Coins - "(AMPL|1EARTH|ILA|BOBA|CWAR|MEM|OMG|XYM|CARR|SGB|SKEY|KLV|KOK|DMTR|CPOOL|KRL|MLS|SB|CEL|WWY|PTS|TORN|BANK|SYLO|VR|DOME|LUNATOKEN|NFTY|EPK|ZBC|AZY|PLATO|ACA|XCN|FTT|SRM|BVT|SWP|YFII|XWG|PIAS|KICKS|TIME|WEMIX|ANC|MIR|CELT|ZKT|GRV|SMART|RLY|REP|DRGN|WXT|ROSN|KYL|FRR|LEMN|NEBL|AUTO|UNB|CARE|VGX|EDG|LOVE|SHFT|ASTRA|SUKU|CHO|LOOM|BTS|SVT|ORDI|SWRV|DAPPT|BOB|ID|ZPAY|PCX|PEPE2|SIN|NOM|WOM|NULS|KOL|RED|PRIMAL|ACN|OMN|SWINGBY|MOOV|DPX|SOS|TOMO|NXD|KAT|CGG|PEEL|SATS|ORDI|BERRY|SOLS|FORE|LEO|JAM|BETS|BOTTO|SEAT|XFI|GAGA|CLFI|MAP|HAN|LIF3|STRUMP|BVM|PINKNINJA|HANK|ANON|SPCT|LUCA|PPC|ABEL|WAVES|WNXM|QTK|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|TRUMP|CAVADA|SQUAD|STC|TIN|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|LFT|DOCK|POLS|DJT|FOG|FIGHT.*|TXA|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|PXT|MSN|NFM|OCB|MTMS|SBCC|USBT|SAVM|RFD|DSLA|HAKA|KMA|ALT|KNFT|ZERO|APES|BITBOARD|UNM|IRON|LB|EAI|SFT|HSF|CUN|GOKU|BABYNEIROBSC|FINEETH|ZENIX|CAT1|GFF|AIDEEPGAMES|HK|PROTON|INFI|BFC|STFY|MORPHA|KDAO|WRAT|STARD|WIN1|DPAW|PNS|MAYHEM|KISHKA|ZST|LAG|WIFCEO|KITEAI|KIM|POWERAI|UB|MRST|FAN|SPOL|MTPE|NRS|3KM|SMARTAI|GFT|KEY|KING|INFRA|EML|BLZ|DAR|TROY|STMX)/.*" + "(AMPL|1EARTH|ILA|BOBA|CWAR|MEM|OMG|XYM|CARR|SGB|SKEY|KLV|KOK|DMTR|CPOOL|KRL|MLS|SB|CEL|WWY|PTS|TORN|BANK|SYLO|VR|DOME|LUNATOKEN|NFTY|EPK|ZBC|AZY|PLATO|ACA|XCN|FTT|SRM|BVT|SWP|YFII|XWG|PIAS|KICKS|TIME|WEMIX|ANC|MIR|CELT|ZKT|GRV|SMART|RLY|REP|DRGN|WXT|ROSN|KYL|FRR|LEMN|NEBL|AUTO|UNB|CARE|VGX|EDG|LOVE|SHFT|ASTRA|SUKU|CHO|LOOM|BTS|SVT|ORDI|SWRV|DAPPT|BOB|ID|ZPAY|PCX|PEPE2|SIN|NOM|WOM|NULS|KOL|RED|PRIMAL|ACN|OMN|SWINGBY|MOOV|DPX|SOS|TOMO|NXD|KAT|CGG|PEEL|SATS|ORDI|BERRY|SOLS|FORE|LEO|JAM|BETS|BOTTO|SEAT|XFI|GAGA|CLFI|MAP|HAN|LIF3|STRUMP|BVM|PINKNINJA|HANK|ANON|SPCT|LUCA|PPC|ABEL|WAVES|WNXM|QTK|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|GME|TRUMP|CAVADA|SQUAD|STC|TIN|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|LFT|DOCK|POLS|DJT|FOG|FIGHT.*|TXA|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|PXT|MSN|NFM|OCB|MTMS|SBCC|USBT|SAVM|RFD|DSLA|HAKA|KMA|ALT|KNFT|ZERO|APES|BITBOARD|UNM|IRON|LB|EAI|SFT|HSF|CUN|GOKU|BABYNEIROBSC|FINEETH|ZENIX|CAT1|GFF|AIDEEPGAMES|HK|PROTON|INFI|BFC|STFY|MORPHA|KDAO|WRAT|STARD|WIN1|DPAW|PNS|MAYHEM|KISHKA|ZST|LAG|WIFCEO|KITEAI|KIM|POWERAI|UB|MRST|FAN|SPOL|MTPE|NRS|3KM|SMARTAI|GFT|KEY|KING|INFRA|EML|BLZ|DAR|TROY|STMX|FTM)/.*" ] } } diff --git a/configs/blacklist-okx.json b/configs/blacklist-okx.json index 33eee5b69a..3edc65903c 100644 --- a/configs/blacklist-okx.json +++ b/configs/blacklist-okx.json @@ -12,7 +12,7 @@ // FAN Tokens "(ACM|AFA|ALA|ALL|ALPINE|APL|ASR|ATM|BAR|CAI|CITY|FOR|GAL|GOZ|IBFK|JUV|LEG|LOCK-1|NAVI|NMR|NOV|PFL|PORTO|PSG|ROUSH|STV|TH|TRA|UCH|UFC|YBO|ARG)/.*", // Other Coins - "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|DMTR|MLS|CEL|TORN|DOME|LUNA|ZBC|AZY|ACA|FTT|SRM|YFII|WEMIX|ANC|MIR|CELT|REP|WXT|SWRV|ID|RFUEL|PLS|NULS|KOL|MOVEZ|OMN|SATS|ORDI|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|STC|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|ZERO|GFT|KEY)/.*" + "(1EARTH|ILA|MEM|AMPL|BOBA|CWAR|OMG|XYM|POLX|CARR|SKEY|KLV|KRL|DMTR|MLS|CEL|TORN|DOME|LUNA|ZBC|AZY|ACA|FTT|SRM|YFII|WEMIX|ANC|MIR|CELT|REP|WXT|SWRV|ID|RFUEL|PLS|NULS|KOL|MOVEZ|OMN|SATS|ORDI|XEM|ZEC|ELF|ARK|MDX|BETA|KP3R|AKRO|AMB|BOND|FIRO|OAX|EPX|OOKI|STC|TRUMP|MAGA|MAGAETH|TREMP|BODEN|STRUMP|TOOKER|TMANIA|BOBBY|BABYTRUMP|PTTRUMP|DTI|TRUMPIE|MAGAPEPE|PEPEMAGA|HARD|MBL|GAL|DOCK|POLS|CTXC|JASMY|BAL|SNT|CREAM|REN|LINA|REEF|UNFI|IRIS|CVP|ZERO|GFT|KEY|FTM)/.*" ] } } From eaf1d430cf017abaa67250b3aefbfb8c2cd4ad33 Mon Sep 17 00:00:00 2001 From: iterativ Date: Sun, 5 Jan 2025 15:31:33 +0200 Subject: [PATCH 9/9] X5: add global protection rule (Long). --- NostalgiaForInfinityX5.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/NostalgiaForInfinityX5.py b/NostalgiaForInfinityX5.py index 6335adbe60..c527f8d58e 100644 --- a/NostalgiaForInfinityX5.py +++ b/NostalgiaForInfinityX5.py @@ -67,7 +67,7 @@ class NostalgiaForInfinityX5(IStrategy): INTERFACE_VERSION = 3 def version(self) -> str: - return "v15.1.314" + return "v15.1.315" stoploss = -0.99 @@ -6115,6 +6115,26 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame: | (df["CCI_20_4h"] < -250.0) | (df["RSI_14_1d"] < 30.0) ) + # 15m & 1h & 4h & 1d down move, 15m & 1h & 4h still not low enough, 1d still high + & ( + (df["RSI_3_15m"] > 15.0) + | (df["RSI_3_1h"] > 25.0) + | (df["RSI_3_4h"] > 25.0) + | (df["RSI_3_1d"] > 40.0) + | (df["RSI_14_15m"] < 20.0) + | (df["CCI_20_15m"] < -200.0) + | (df["STOCHk_14_3_3_15m"] < 10.0) + | (df["RSI_14_1h"] < 20.0) + | (df["WILLR_14_1h"] < -90.0) + | (df["CCI_20_1h"] < -200.0) + | (df["STOCHk_14_3_3_1h"] < 20.0) + | (df["RSI_14_4h"] < 30.0) + | (df["WILLR_14_4h"] < -90.0) + | (df["CCI_20_4h"] < -200.0) + | (df["STOCHk_14_3_3_4h"] < 20.0) + | (df["RSI_14_1d"] < 50.0) + | (df["STOCHk_14_3_3_1d"] < 50.0) + ) # 15m & 1h & 4h & 1d down move, 15m & 1h & 4h & 1d still not low enough & ( (df["RSI_3_15m"] > 15.0)