Merge branch 'test_custom_exit' of https://github.com/Canx/NostalgiaF…

…orInfinity into test_custom_exit
iterativv · Jan 6, 2025 · ed9718b · ed9718b
2 parents f0f7602 + dc63a33
commit ed9718b
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 82 deletions.
diff --git a/NostalgiaForInfinityX5.py b/NostalgiaForInfinityX5.py
@@ -67,7 +67,7 @@ class NostalgiaForInfinityX5(IStrategy):
   INTERFACE_VERSION = 3
 
   def version(self) -> str:
-    return "v15.1.315"
+    return "v15.1.317"
 
   stoploss = -0.99
 
@@ -3162,16 +3162,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame:
         | (df["RSI_14_1d"] < 50.0)
         | (df["STOCHRSIk_14_14_3_3_1d"] < 80.0)
       )
-      # 15m & 1h down move, 1h still high, 4h high, 1d still high
-      & (
-        (df["RSI_3_15m"] > 15.0)
-        | (df["RSI_3_1h"] > 40.0)
-        | (df["AROONU_14_1h"] < 50.0)
-        | (df["AROONU_14_4h"] < 75.0)
-        | (df["WILLR_14_4h"] < -30.0)
-        | (df["STOCHRSIk_14_14_3_3_4h"] < 80.0)
-        | (df["STOCHRSIk_14_14_3_3_1d"] < 50.0)
-      )
       # 15m & 1h & 4h down move, 15m & 1h & 4h still not low enough, 1d high & overbought
       & (
         (df["RSI_3_15m"] > 20.0)
@@ -3201,17 +3191,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame:
         | (df["STOCHRSIk_14_14_3_3_1d"] < 80.0)
         | (df["ROC_9_1d"] < 30.0)
       )
-      # 15m & 1h & 4h down move, 15m & 1h & 4h still not low enough, 1d high
-      & (
-        (df["RSI_3_15m"] > 5.0)
-        | (df["RSI_3_1h"] > 25.0)
-        | (df["RSI_3_4h"] > 40.0)
-        | (df["STOCHRSIk_14_14_3_3_15m"] < 10.0)
-        | (df["RSI_14_1h"] < 35.0)
-        | (df["RSI_14_4h"] < 40.0)
-        | (df["RSI_14_1d"] < 50.0)
-        | (df["STOCHRSIk_14_14_3_3_1d"] < 90.0)
-      )
       # 15m & 1h & 4h & 1d down move, 15m & 1h still not low enough, 4h still high, 1d still high & overbought
       & (
         (df["RSI_3_15m"] > 5.0)
@@ -3445,17 +3424,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame:
         | (df["AROONU_14_1d"] < 75.0)
         | (df["ROC_9_1d"] < 15.0)
       )
-      # 15m & 1h & 4h down move, 15m still not low enough, 4h & 1d still high
-      & (
-        (df["RSI_3_15m"] > 20.0)
-        | (df["RSI_3_1h"] > 25.0)
-        | (df["RSI_3_4h"] > 50.0)
-        | (df["AROONU_14_15m"] < 25.0)
-        | (df["AROONU_14_4h"] < 75.0)
-        | (df["STOCHRSIk_14_14_3_3_4h"] < 30.0)
-        | (df["AROONU_14_1d"] < 75.0)
-        | (df["STOCHRSIk_14_14_3_3_1d"] < 70.0)
-      )
       # 15m & 1h & 4h down move, 15m & 1h still not low enough, 4h still high, 1d still high & overbought
       & (
         (df["RSI_3_15m"] > 20.0)
@@ -4076,17 +4044,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame:
         | (df["RSI_14_1d"] < 50.0)
         | (df["AROONU_14_1d"] < 75.0)
       )
-      # 15m down move, 15m still not low enough, 1h & 4h high, 1d overbought
-      & (
-        (df["RSI_3_15m"] > 35.0)
-        | (df["AROONU_14_15m"] < 25.0)
-        | (df["STOCHRSIk_14_14_3_3_1h"] < 90.0)
-        | (df["AROONU_14_4h"] < 75.0)
-        | (df["WILLR_14_4h"] < -20.0)
-        | (df["STOCHRSIk_14_14_3_3_4h"] < 70.0)
-        | (df["RSI_14_1d"] < 75.0)
-        | (df["ROC_9_1d"] < 50.0)
-      )
       # 15m & 1 & 4h down move, 15m & 1h & 4h still not low enough, 1d still high
       & (
         (df["RSI_3_15m"] > 35.0)
@@ -4485,29 +4442,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame:
         | (df["STOCHRSIk_14_14_3_3_1d"] < 90.0)
         | (df["ROC_9_1d"] < 30.0)
       )
-      # 15m & 1h down move, 15m & 1h still high, 4h high, 1d overbought
-      & (
-        (df["RSI_3_15m"] > 40.0)
-        | (df["RSI_3_1h"] > 40.0)
-        | (df["AROONU_14_15m"] < 50.0)
-        | (df["STOCHRSIk_14_14_3_3_15m"] < 20.0)
-        | (df["RSI_14_1h"] < 50.0)
-        | (df["AROONU_14_4h"] < 75.0)
-        | (df["STOCHRSIk_14_14_3_3_4h"] < 80.0)
-        | (df["ROC_9_1d"] < 50.0)
-      )
-      # 15m & 4h down move, 15m & 1h stil high, 4h high
-      & (
-        (df["RSI_3_15m"] > 40.0)
-        | (df["RSI_3_4h"] > 60.0)
-        | (df["AROONU_14_15m"] < 50.0)
-        | (df["STOCHRSIk_14_14_3_3_15m"] < 50.0)
-        | (df["RSI_14_1h"] < 50.0)
-        | (df["AROONU_14_1h"] < 25.0)
-        | (df["RSI_14_4h"] < 50.0)
-        | (df["AROONU_14_4h"] < 75.0)
-        | (df["STOCHRSIk_14_14_3_3_4h"] < 70.0)
-      )
       # 15m down move, 15m still not low enough, 1h & 4h high, 4h overbought
       & (
         (df["RSI_3_15m"] > 40.0)
@@ -4548,16 +4482,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame:
         | (df["ROC_9_4h"] > -15.0)
         | (df["ROC_9_1d"] < 50.0)
       )
-      # 15m down move, 15m & 1h & 1d high
-      & (
-        (df["RSI_3_15m"] > 40.0)
-        | (df["AROONU_14_15m"] < 75.0)
-        | (df["WILLR_14_1h"] < -10.0)
-        | (df["AROONU_14_1h"] < 75.0)
-        | (df["STOCHRSIk_14_14_3_3_1h"] < 90.0)
-        | (df["AROONU_14_1d"] < 75.0)
-        | (df["STOCHRSIk_14_14_3_3_1d"] < 80.0)
-      )
       # 15m & 1h down move, 15m & 1h still not low enough, 4h high & overbought
       & (
         (df["RSI_3_15m"] > 45.0)

diff --git a/configs/exampleconfig_secret.json b/configs/exampleconfig_secret.json
@@ -19,7 +19,10 @@
   "exchange": {
     "name": "binance",
     "key": "",
+    "password": "",
     "secret": "",
+    "walletAddress": "",
+    "privateKey": "",
     "ccxt_config": {},
     "ccxt_async_config": {},
     "pair_whitelist": []

diff --git a/configs/pairlist-volume-binance-busd.json b/configs/pairlist-volume-binance-busd.json
@@ -31,7 +31,7 @@
     // },
     {
       "method": "VolumePairList",
-      "number_assets": 75,
+      "number_assets": 80,
       "sort_key": "quoteVolume"
     },
     // { "method": "ShuffleFilter" }

diff --git a/configs/pairlist-volume-bitget-btc.json b/configs/pairlist-volume-bitget-btc.json
@@ -31,7 +31,7 @@
     // },
     {
       "method": "VolumePairList",
-      "number_assets": 75,
+      "number_assets": 80,
       "sort_key": "quoteVolume"
     },
     // { "method": "ShuffleFilter" }

diff --git a/configs/pairlist-volume-bitget-usdt.json b/configs/pairlist-volume-bitget-usdt.json
@@ -31,7 +31,7 @@
     // },
     {
       "method": "VolumePairList",
-      "number_assets": 75,
+      "number_assets": 80,
       "sort_key": "quoteVolume"
     },
     // { "method": "ShuffleFilter" }

diff --git a/configs/pairlist-volume-ftx-btc.json b/configs/pairlist-volume-ftx-btc.json
@@ -31,7 +31,7 @@
     // },
     {
       "method": "VolumePairList",
-      "number_assets": 75,
+      "number_assets": 80,
       "sort_key": "quoteVolume"
     },
     // { "method": "ShuffleFilter" }

diff --git a/configs/pairlist-volume-ftx-usdt.json b/configs/pairlist-volume-ftx-usdt.json
@@ -31,7 +31,7 @@
     // },
     {
       "method": "VolumePairList",
-      "number_assets": 75,
+      "number_assets": 80,
       "sort_key": "quoteVolume"
     },
     // { "method": "ShuffleFilter" }

diff --git a/live-account-example.env b/live-account-example.env
@@ -9,7 +9,11 @@ FREQTRADE__TRADING_MODE=futures
 
 FREQTRADE__EXCHANGE__NAME=binance
 FREQTRADE__EXCHANGE__KEY=Put_Your_Exchange_Key_Here
+# FREQTRADE__EXCHANGE__PASSWORD=Put_Your_Exchange_Key_Password_Here
 FREQTRADE__EXCHANGE__SECRET=Put_Your_Exchange_Keys_Secret_Here
+# hyperliquid
+# FREQTRADE__EXCHANGE__WALLET_ADDRESS=Your_Eth_Wallet_Address
+# FREQTRADE__EXCHANGE__PRIVATE_KEY=Your_Api_Private_Key
 
 FREQTRADE__TELEGRAM__ENABLED=false
 FREQTRADE__TELEGRAM__TOKEN=123123123:123123YourTelegramTokenConfiguration