changed the way antminers and whatsminers are handled in the factory to allow for more precision on chip counts

miners/antminer/X17/bmminer.py

@@ -1,9 +0,0 @@
-from miners.bmminer import BMMiner
-
-
-class BMMinerX17(BMMiner):
-    def __init__(self, ip: str) -> None:
-        super().__init__(ip)
-
-    def __repr__(self) -> str:
-        return f"BMMinerX17: {str(self.ip)}"

miners/antminer/X19/bmminer.py

@@ -1,23 +0,0 @@
-from miners.bmminer import BMMiner
-import logging
-
-
-class BMMinerX19(BMMiner):
-    def __init__(self, ip: str) -> None:
-        super().__init__(ip)
-        self.nominal_chips = 126
-
-    def __repr__(self) -> str:
-        return f"BMMinerX19: {str(self.ip)}"
-
-    async def get_model(self):
-        if self.model:
-            logging.debug(f"Found model for {self.ip}: {self.model}")
-            return self.model
-        version_data = await self.api.version()
-        if version_data:
-            self.model = version_data["VERSION"][0]["Type"].replace("Antminer ", "")
-            logging.debug(f"Found model for {self.ip}: {self.model}")
-            return self.model
-        logging.warning(f"Failed to get model for miner: {self}")
-        return None

miners/antminer/X19/cgminer.py

@@ -1,23 +0,0 @@
-from miners.cgminer import CGMiner
-import logging
-
-
-class CGMinerX19(CGMiner):
-    def __init__(self, ip: str) -> None:
-        super().__init__(ip)
-        self.api_type = "CGMiner"
-
-    def __repr__(self) -> str:
-        return f"CGMinerX19: {str(self.ip)}"
-
-    async def get_model(self):
-        if self.model:
-            logging.debug(f"Found model for {self.ip}: {self.model}")
-            return self.model
-        version_data = await self.api.version()
-        if version_data:
-            self.model = version_data["VERSION"][0]["Type"].replace("Antminer ", "")
-            logging.debug(f"Found model for {self.ip}: {self.model}")
-            return self.model
-        logging.warning(f"Failed to get model for miner: {self}")
-        return None

miners/antminer/__init__.py

@@ -0,0 +1,4 @@
+from .bmminer import *
+from .bosminer import *
+from .cgminer import *
+from .hiveon import *

miners/antminer/bmminer/X17/S17.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerS17(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "S17"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BMMinerS17: {str(self.ip)}"

miners/antminer/bmminer/X17/S17_Plus.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerS17Plus(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "S17+"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BMMinerS17+: {str(self.ip)}"

miners/antminer/bmminer/X17/S17_Pro.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerS17Pro(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "S17 Pro"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BMMinerS17Pro: {str(self.ip)}"

miners/antminer/bmminer/X17/S17e.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerS17e(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "S17e"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BMMinerS17e: {str(self.ip)}"

miners/antminer/bmminer/X17/T17.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerT17(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "T17"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BMMinerT17: {str(self.ip)}"

miners/antminer/bmminer/X17/T17_Plus.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerT17Plus(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "T17+"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BMMinerT17+: {str(self.ip)}"

miners/antminer/bmminer/X17/T17e.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerT17e(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "T17e"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BMMinerT17e: {str(self.ip)}"

miners/antminer/bmminer/X17/__init__.py

@@ -0,0 +1,8 @@
+from .S17 import BMMinerS17
+from .S17_Plus import BMMinerS17Plus
+from .S17_Pro import BMMinerS17Pro
+from .S17e import BMMinerS17e
+
+from .T17 import BMMinerT17
+from .T17_Plus import BMMinerT17Plus
+from .T17e import BMMinerT17e

miners/antminer/bmminer/X19/S19.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerS19(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "S19"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"BMMinerS19: {str(self.ip)}"

miners/antminer/bmminer/X19/S19_Pro.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerS19Pro(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "S19 Pro"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"BMMinerS19Pro: {str(self.ip)}"

miners/antminer/bmminer/X19/S19j.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerS19j(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "S19j"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"BMMinerS19j: {str(self.ip)}"

miners/antminer/bmminer/X19/S19j_Pro.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerS19jPro(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "S19j Pro"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"BMMinerS19jPro: {str(self.ip)}"

miners/antminer/bmminer/X19/T19.py

@@ -0,0 +1,12 @@
+from miners.bmminer import BMMiner
+
+
+class BMMinerT19(BMMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BMMiner"
+        self.model = "T19"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"BMMinerT19: {str(self.ip)}"

miners/antminer/bmminer/X19/__init__.py

@@ -0,0 +1,7 @@
+from .S19 import BMMinerS19
+from .S19_Pro import BMMinerS19Pro
+
+from .S19j import BMMinerS19j
+from .S19j_Pro import BMMinerS19jPro
+
+from .T19 import BMMinerT19

miners/antminer/bmminer/X9/__init__.py

@@ -0,0 +1,2 @@
+from .S9 import BMMinerS9
+from .T9 import BMMinerT9

miners/antminer/bmminer/__init__.py

@@ -0,0 +1,3 @@
+from .X9 import *
+from .X17 import *
+from .X19 import *

miners/antminer/bosminer/X17/S17.py

@@ -1,11 +1,12 @@
 from miners.bosminer import BOSMiner
 
 
-class BOSMinerX17(BOSMiner):
+class BOSMinerS17(BOSMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
         self.api_type = "BOSMiner"
+        self.model = "S17"
         self.nominal_chips = 65
 
     def __repr__(self) -> str:
-        return f"BOSminerX17: {str(self.ip)}"
+        return f"BOSMinerS17: {str(self.ip)}"

miners/antminer/bosminer/X17/S17_Plus.py

@@ -0,0 +1,12 @@
+from miners.bosminer import BOSMiner
+
+
+class BOSMinerS17Plus(BOSMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BOSMiner"
+        self.model = "S17+"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BOSMinerS17+: {str(self.ip)}"

miners/antminer/bosminer/X17/S17_Pro.py

@@ -0,0 +1,12 @@
+from miners.bosminer import BOSMiner
+
+
+class BOSMinerS17Pro(BOSMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BOSMiner"
+        self.model = "S17 Pro"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BOSMinerS17Pro: {str(self.ip)}"

miners/antminer/bosminer/X17/S17e.py

@@ -0,0 +1,12 @@
+from miners.bosminer import BOSMiner
+
+
+class BOSMinerS17e(BOSMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BOSMiner"
+        self.model = "S17e"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BOSMinerS17e: {str(self.ip)}"

miners/antminer/bosminer/X17/T17.py

@@ -0,0 +1,12 @@
+from miners.bosminer import BOSMiner
+
+
+class BOSMinerT17(BOSMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BOSMiner"
+        self.model = "T17"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BOSMinerT17: {str(self.ip)}"

miners/antminer/bosminer/X17/T17_Plus.py

@@ -0,0 +1,12 @@
+from miners.bosminer import BOSMiner
+
+
+class BOSMinerT17Plus(BOSMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BOSMiner"
+        self.model = "T17+"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BOSMinerT17+: {str(self.ip)}"

miners/antminer/bosminer/X17/T17e.py

@@ -0,0 +1,12 @@
+from miners.bosminer import BOSMiner
+
+
+class BOSMinerT17e(BOSMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BOSMiner"
+        self.model = "T17e"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"BOSMinerT17e: {str(self.ip)}"

miners/antminer/bosminer/X17/__init__.py

@@ -0,0 +1,8 @@
+from .S17 import BOSMinerS17
+from .S17_Plus import BOSMinerS17Plus
+from .S17_Pro import BOSMinerS17Pro
+from .S17e import BOSMinerS17e
+
+from .T17 import BOSMinerT17
+from .T17_Plus import BOSMinerT17Plus
+from .T17e import BOSMinerT17e

miners/antminer/bosminer/X19/S19.py

@@ -1,11 +1,12 @@
 from miners.bosminer import BOSMiner
 
 
-class BOSMinerX19(BOSMiner):
+class BOSMinerS19(BOSMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
         self.api_type = "BOSMiner"
+        self.model = "S19"
         self.nominal_chips = 114
 
     def __repr__(self) -> str:
-        return f"BOSminerX19: {str(self.ip)}"
+        return f"BOSMinerS19: {str(self.ip)}"

miners/antminer/bosminer/X19/S19_Pro.py

@@ -0,0 +1,12 @@
+from miners.bosminer import BOSMiner
+
+
+class BOSMinerS19Pro(BOSMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BOSMiner"
+        self.model = "S19 Pro"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"BOSMinerS19Pro: {str(self.ip)}"

miners/antminer/bosminer/X19/S19j.py

@@ -0,0 +1,12 @@
+from miners.bosminer import BOSMiner
+
+
+class BOSMinerS19j(BOSMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BOSMiner"
+        self.model = "S19j"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"BOSMinerS19j: {str(self.ip)}"

miners/antminer/bosminer/X19/S19j_Pro.py

@@ -0,0 +1,12 @@
+from miners.bosminer import BOSMiner
+
+
+class BOSMinerS19jPro(BOSMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BOSMiner"
+        self.model = "S19j Pro"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"BOSMinerS19jPro: {str(self.ip)}"

miners/antminer/bosminer/X19/T19.py

@@ -0,0 +1,12 @@
+from miners.bosminer import BOSMiner
+
+
+class BOSMinerT19(BOSMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "BOSMiner"
+        self.model = "T19"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"BOSMinerT19: {str(self.ip)}"

miners/antminer/bosminer/X19/__init__.py

@@ -0,0 +1,7 @@
+from .S19 import BOSMinerS19
+from .S19_Pro import BOSMinerS19Pro
+
+from .S19j import BOSMinerS19j
+from .S19j_Pro import BOSMinerS19jPro
+
+from .T19 import BOSMinerT19

miners/antminer/bosminer/X9/S9.py

@@ -1,8 +1,4 @@
-import logging
-import toml
-
 from miners.bosminer import BOSMiner
-from config.bos import general_config_convert_bos
 
 
 class BOSMinerS9(BOSMiner):
@@ -12,4 +8,4 @@ class BOSMinerS9(BOSMiner):
         self.api_type = "BOSMiner"
 
     def __repr__(self) -> str:
-        return f"BOSminerS9: {str(self.ip)}"
+        return f"BOSMinerS9: {str(self.ip)}"

miners/antminer/bosminer/X9/__init__.py

@@ -0,0 +1 @@
+from .S9 import BOSMinerS9

miners/antminer/bosminer/__init__.py

@@ -0,0 +1,3 @@
+from .X9 import *
+from .X17 import *
+from .X19 import *

miners/antminer/cgminer/X17/S17.py

@@ -1,10 +1,12 @@
 from miners.cgminer import CGMiner
 
 
-class CGMinerX17(CGMiner):
+class CGMinerS17(CGMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
         self.api_type = "CGMiner"
+        self.model = "S17"
+        self.nominal_chips = 65
 
     def __repr__(self) -> str:
-        return f"CGMinerX17: {str(self.ip)}"
+        return f"CGMinerS17: {str(self.ip)}"

miners/antminer/cgminer/X17/S17_Plus.py

@@ -0,0 +1,12 @@
+from miners.cgminer import CGMiner
+
+
+class CGMinerS17Plus(CGMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "CGMiner"
+        self.model = "S17+"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"CGMinerS17+: {str(self.ip)}"

miners/antminer/cgminer/X17/S17_Pro.py

@@ -0,0 +1,12 @@
+from miners.cgminer import CGMiner
+
+
+class CGMinerS17Pro(CGMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "CGMiner"
+        self.model = "S17 Pro"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"CGMinerS17Pro: {str(self.ip)}"

miners/antminer/cgminer/X17/S17e.py

@@ -0,0 +1,12 @@
+from miners.cgminer import CGMiner
+
+
+class CGMinerS17e(CGMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "CGMiner"
+        self.model = "S17e"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"CGMinerS17e: {str(self.ip)}"

miners/antminer/cgminer/X17/T17.py

@@ -0,0 +1,12 @@
+from miners.cgminer import CGMiner
+
+
+class CGMinerT17(CGMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "CGMiner"
+        self.model = "T17"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"CGMinerT17: {str(self.ip)}"

miners/antminer/cgminer/X17/T17_Plus.py

@@ -0,0 +1,12 @@
+from miners.cgminer import CGMiner
+
+
+class CGMinerT17Plus(CGMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "CGMiner"
+        self.model = "T17+"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"CGMinerT17+: {str(self.ip)}"

miners/antminer/cgminer/X17/T17e.py

@@ -0,0 +1,12 @@
+from miners.cgminer import CGMiner
+
+
+class CGMinerT17e(CGMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "CGMiner"
+        self.model = "T17e"
+        self.nominal_chips = 65
+
+    def __repr__(self) -> str:
+        return f"CGMinerT17e: {str(self.ip)}"

miners/antminer/cgminer/X17/__init__.py

@@ -0,0 +1,8 @@
+from .S17 import CGMinerS17
+from .S17_Plus import CGMinerS17Plus
+from .S17_Pro import CGMinerS17Pro
+from .S17e import CGMinerS17e
+
+from .T17 import CGMinerT17
+from .T17_Plus import CGMinerT17Plus
+from .T17e import CGMinerT17e

miners/antminer/cgminer/X19/S19.py

@@ -0,0 +1,12 @@
+from miners.cgminer import CGMiner
+
+
+class CGMinerS19(CGMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "CGMiner"
+        self.model = "S19"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"CGMinerS19: {str(self.ip)}"

miners/antminer/cgminer/X19/S19_Pro.py

@@ -0,0 +1,12 @@
+from miners.cgminer import CGMiner
+
+
+class CGMinerS19Pro(CGMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "CGMiner"
+        self.model = "S19 Pro"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"CGMinerS19Pro: {str(self.ip)}"

miners/antminer/cgminer/X19/S19j.py

@@ -0,0 +1,12 @@
+from miners.cgminer import CGMiner
+
+
+class CGMinerS19j(CGMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "CGMiner"
+        self.model = "S19j"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"CGMinerS19j: {str(self.ip)}"

miners/antminer/cgminer/X19/S19j_Pro.py

@@ -0,0 +1,12 @@
+from miners.cgminer import CGMiner
+
+
+class CGMinerS19jPro(CGMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "CGMiner"
+        self.model = "S19j Pro"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"CGMinerS19jPro: {str(self.ip)}"

miners/antminer/cgminer/X19/T19.py

@@ -0,0 +1,12 @@
+from miners.cgminer import CGMiner
+
+
+class CGMinerT19(CGMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.api_type = "CGMiner"
+        self.model = "T19"
+        self.nominal_chips = 114
+
+    def __repr__(self) -> str:
+        return f"CGMinerT19: {str(self.ip)}"

miners/antminer/cgminer/X19/__init__.py

@@ -0,0 +1,7 @@
+from .S19 import CGMinerS19
+from .S19_Pro import CGMinerS19Pro
+
+from .S19j import CGMinerS19j
+from .S19j_Pro import CGMinerS19jPro
+
+from .T19 import CGMinerT19

miners/antminer/cgminer/X9/__init__.py

@@ -0,0 +1,2 @@
+from .S9 import CGMinerS9
+from .T9 import CGMinerT9

miners/antminer/cgminer/__init__.py

@@ -0,0 +1,3 @@
+from .X9 import *
+from .X17 import *
+from .X19 import *

miners/antminer/hiveon/X9/__init__.py

@@ -0,0 +1 @@
+from .T9 import HiveonT9

miners/antminer/hiveon/__init__.py

@@ -0,0 +1 @@
+from .X9 import *