openfund-maker 1.2.4__tar.gz → 1.2.5__tar.gz

{openfund_maker-1.2.4 → openfund_maker-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openfund-maker
-Version: 1.2.4
+Version: 1.2.5
 Summary: Openfund-maker.
 Requires-Python: >=3.9,<4.0
 Classifier: Programming Language :: Python :: 3

{openfund_maker-1.2.4 → openfund_maker-1.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openfund-maker"
-version = "1.2.4"
+version = "1.2.5"
 description = "Openfund-maker."
 authors = []
 readme = "README.md"

{openfund_maker-1.2.4 → openfund_maker-1.2.5}/src/maker/MACDOrderBot.py

@@ -63,7 +63,7 @@ class MACDOrdergBot(ThreeLineOrdergBot):
                 break
             
         self.logger.debug(f"{symbol} : \n- 所有cross {all_cross} \n- 零轴之上cross {last_up_crosses} \n- 零轴之下cross {last_down_crosses} \n- 其他corss {other_crosses}。")
-        valid_klines = pair_config.get('valid_klines', 3)
+        valid_klines = pair_config.get('valid_klines', 5)
         # 如果最新的交叉是金叉，且又是零轴上方的金叉
         if len(last_up_crosses) > 0 and all_cross[0][0] == 'golden' and all_cross[0][1] == last_up_crosses[0][1] and len(macd) - all_cross[0][1] <= valid_klines:
             order_side =  'buy'
@@ -79,7 +79,9 @@ class MACDOrdergBot(ThreeLineOrdergBot):
            # 零轴之上的死叉-金叉-死叉模式
             if (last_up_crosses[0][0] == 'death' and 
                 last_up_crosses[1][0] == 'golden' and 
-                last_up_crosses[2][0] == 'death'):
+                last_up_crosses[2][0] == 'death' and
+                len(macd) - last_up_crosses[0][1] <= valid_klines
+                ):
                 order_side = 'sell'
                 self.logger.debug(f"{symbol} : 零轴之上的死叉-金叉-死叉模式 {order_side}。")
             
@@ -87,7 +89,9 @@ class MACDOrdergBot(ThreeLineOrdergBot):
             # 零轴之下的金叉-死叉-金叉模式
             if (last_down_crosses[0][0] == 'golden' and 
                   last_down_crosses[1][0] == 'death' and 
-                  last_down_crosses[2][0] == 'golden'):
+                  last_down_crosses[2][0] == 'golden' and
+                  len(macd) - last_down_crosses[0][1] <= valid_klines
+                  ):
                 order_side = 'buy'
                 self.logger.debug(f"{symbol} : 零轴之下的金叉-死叉-金叉模式 {order_side}。")