version: bump version number.

docs/miners/antminer/X15.md

@@ -0,0 +1,11 @@
+# pyasic
+## X15 Models
+
+
+## Z15
+
+::: pyasic.miners.zec.antminer.cgminer.X15.Z15.CGMinerZ15
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4

docs/miners/antminer/X17.md

@@ -3,7 +3,7 @@
 
 ## S17
 
-::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17
+::: pyasic.miners.btc.antminer.bmminer.X17.S17.BMMinerS17
     handler: python
     options:
         show_root_heading: false
@@ -11,7 +11,7 @@
 
 ## S17+
 
-::: pyasic.miners.antminer.bmminer.X17.S17_Plus.BMMinerS17Plus
+::: pyasic.miners.btc.antminer.bmminer.X17.S17_Plus.BMMinerS17Plus
     handler: python
     options:
         show_root_heading: false
@@ -19,7 +19,7 @@
 
 ## S17 Pro
 
-::: pyasic.miners.antminer.bmminer.X17.S17_Pro.BMMinerS17Pro
+::: pyasic.miners.btc.antminer.bmminer.X17.S17_Pro.BMMinerS17Pro
     handler: python
     options:
         show_root_heading: false
@@ -27,7 +27,7 @@
 
 ## S17e
 
-::: pyasic.miners.antminer.bmminer.X17.S17e.BMMinerS17e
+::: pyasic.miners.btc.antminer.bmminer.X17.S17e.BMMinerS17e
     handler: python
     options:
         show_root_heading: false
@@ -35,7 +35,7 @@
 
 ## T17
 
-::: pyasic.miners.antminer.bmminer.X17.T17.BMMinerT17
+::: pyasic.miners.btc.antminer.bmminer.X17.T17.BMMinerT17
     handler: python
     options:
         show_root_heading: false
@@ -43,7 +43,7 @@
 
 ## T17+
 
-::: pyasic.miners.antminer.bmminer.X17.T17_Plus.BMMinerT17Plus
+::: pyasic.miners.btc.antminer.bmminer.X17.T17_Plus.BMMinerT17Plus
     handler: python
     options:
         show_root_heading: false
@@ -52,7 +52,7 @@
 
 ## T17e
 
-::: pyasic.miners.antminer.bmminer.X17.T17e.BMMinerT17e
+::: pyasic.miners.btc.antminer.bmminer.X17.T17e.BMMinerT17e
     handler: python
     options:
         show_root_heading: false
@@ -61,7 +61,7 @@
 
 ## S17 (BOS)
 
-::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17
+::: pyasic.miners.btc.antminer.bosminer.X17.S17.BOSMinerS17
     handler: python
     options:
         show_root_heading: false
@@ -69,7 +69,7 @@
 
 ## S17+ (BOS)
 
-::: pyasic.miners.antminer.bosminer.X17.S17_Plus.BOSMinerS17Plus
+::: pyasic.miners.btc.antminer.bosminer.X17.S17_Plus.BOSMinerS17Plus
     handler: python
     options:
         show_root_heading: false
@@ -77,7 +77,7 @@
 
 ## S17 Pro (BOS)
 
-::: pyasic.miners.antminer.bosminer.X17.S17_Pro.BOSMinerS17Pro
+::: pyasic.miners.btc.antminer.bosminer.X17.S17_Pro.BOSMinerS17Pro
     handler: python
     options:
         show_root_heading: false
@@ -85,7 +85,7 @@
 
 ## S17e (BOS)
 
-::: pyasic.miners.antminer.bosminer.X17.S17e.BOSMinerS17e
+::: pyasic.miners.btc.antminer.bosminer.X17.S17e.BOSMinerS17e
     handler: python
     options:
         show_root_heading: false
@@ -93,7 +93,7 @@
 
 ## T17 (BOS)
 
-::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17
+::: pyasic.miners.btc.antminer.bosminer.X17.T17.BOSMinerT17
     handler: python
     options:
         show_root_heading: false
@@ -101,7 +101,7 @@
 
 ## T17+ (BOS)
 
-::: pyasic.miners.antminer.bosminer.X17.T17_Plus.BOSMinerT17Plus
+::: pyasic.miners.btc.antminer.bosminer.X17.T17_Plus.BOSMinerT17Plus
     handler: python
     options:
         show_root_heading: false
@@ -110,7 +110,7 @@
 
 ## T17e (BOS)
 
-::: pyasic.miners.antminer.bosminer.X17.T17e.BOSMinerT17e
+::: pyasic.miners.btc.antminer.bosminer.X17.T17e.BOSMinerT17e
     handler: python
     options:
         show_root_heading: false

docs/miners/antminer/X19.md

@@ -3,7 +3,15 @@
 
 ## S19
 
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19
+::: pyasic.miners.btc.antminer.bmminer.X19.S19.BMMinerS19
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19L
+
+::: pyasic.miners.btc.antminer.bmminer.X19.S19L.BMMinerS19L
     handler: python
     options:
         show_root_heading: false
@@ -11,7 +19,7 @@
 
 ## S19 Pro
 
-::: pyasic.miners.antminer.bmminer.X19.S19_Pro.BMMinerS19Pro
+::: pyasic.miners.btc.antminer.bmminer.X19.S19_Pro.BMMinerS19Pro
     handler: python
     options:
         show_root_heading: false
@@ -20,7 +28,7 @@
 
 ## S19a
 
-::: pyasic.miners.antminer.bmminer.X19.S19a.BMMinerS19a
+::: pyasic.miners.btc.antminer.bmminer.X19.S19a.BMMinerS19a
     handler: python
     options:
         show_root_heading: false
@@ -29,7 +37,7 @@
 
 ## S19j
 
-::: pyasic.miners.antminer.bmminer.X19.S19j.BMMinerS19j
+::: pyasic.miners.btc.antminer.bmminer.X19.S19j.BMMinerS19j
     handler: python
     options:
         show_root_heading: false
@@ -37,7 +45,7 @@
 
 ## S19j Pro
 
-::: pyasic.miners.antminer.bmminer.X19.S19j_Pro.BMMinerS19jPro
+::: pyasic.miners.btc.antminer.bmminer.X19.S19j_Pro.BMMinerS19jPro
     handler: python
     options:
         show_root_heading: false
@@ -45,7 +53,7 @@
 
 ## S19 XP
 
-::: pyasic.miners.antminer.bmminer.X19.S19_XP.BMMinerS19XP
+::: pyasic.miners.btc.antminer.bmminer.X19.S19_XP.BMMinerS19XP
     handler: python
     options:
         show_root_heading: false
@@ -53,7 +61,7 @@
 
 ## T19
 
-::: pyasic.miners.antminer.bmminer.X19.T19.BMMinerT19
+::: pyasic.miners.btc.antminer.bmminer.X19.T19.BMMinerT19
     handler: python
     options:
         show_root_heading: false
@@ -62,7 +70,7 @@
 
 ## S19 (BOS)
 
-::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19
+::: pyasic.miners.btc.antminer.bosminer.X19.S19.BOSMinerS19
     handler: python
     options:
         show_root_heading: false
@@ -70,7 +78,7 @@
 
 ## S19 Pro (BOS)
 
-::: pyasic.miners.antminer.bosminer.X19.S19_Pro.BOSMinerS19Pro
+::: pyasic.miners.btc.antminer.bosminer.X19.S19_Pro.BOSMinerS19Pro
     handler: python
     options:
         show_root_heading: false
@@ -79,7 +87,7 @@
 
 ## S19j (BOS)
 
-::: pyasic.miners.antminer.bosminer.X19.S19j.BOSMinerS19j
+::: pyasic.miners.btc.antminer.bosminer.X19.S19j.BOSMinerS19j
     handler: python
     options:
         show_root_heading: false
@@ -87,7 +95,7 @@
 
 ## S19j Pro (BOS)
 
-::: pyasic.miners.antminer.bosminer.X19.S19j_Pro.BOSMinerS19jPro
+::: pyasic.miners.btc.antminer.bosminer.X19.S19j_Pro.BOSMinerS19jPro
     handler: python
     options:
         show_root_heading: false
@@ -95,7 +103,7 @@
 
 ## T19 (BOS)
 
-::: pyasic.miners.antminer.bosminer.X19.T19.BOSMinerT19
+::: pyasic.miners.btc.antminer.bosminer.X19.T19.BOSMinerT19
     handler: python
     options:
         show_root_heading: false

docs/miners/antminer/X3.md

@@ -0,0 +1,11 @@
+# pyasic
+## X3 Models
+
+
+## HS3
+
+::: pyasic.miners.hns.antminer.cgminer.X3.HS3.CGMinerHS3
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4

docs/miners/antminer/X5.md

@@ -0,0 +1,11 @@
+# pyasic
+## X5 Models
+
+
+## DR5
+
+::: pyasic.miners.dcr.antminer.cgminer.X5.DR5.CGMinerDR5
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4

docs/miners/antminer/X7.md

@@ -0,0 +1,11 @@
+# pyasic
+## X7 Models
+
+
+## L7
+
+::: pyasic.miners.ltc.antminer.bmminer.X7.L7.BMMinerL7
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4

docs/miners/antminer/X9.md

@@ -4,7 +4,7 @@
 
 ## X9 (BOS)
 
-::: pyasic.miners.antminer.bosminer.X9.S9.BOSMinerS9
+::: pyasic.miners.btc.antminer.bosminer.X9.S9.BOSMinerS9
     handler: python
     options:
         show_root_heading: false
@@ -13,7 +13,7 @@
 
 ## S9
 
-::: pyasic.miners.antminer.bmminer.X9.S9.BMMinerS9
+::: pyasic.miners.btc.antminer.bmminer.X9.S9.BMMinerS9
     handler: python
     options:
         show_root_heading: false
@@ -21,7 +21,7 @@
 
 ## S9i
 
-::: pyasic.miners.antminer.bmminer.X9.S9i.BMMinerS9i
+::: pyasic.miners.btc.antminer.bmminer.X9.S9i.BMMinerS9i
     handler: python
     options:
         show_root_heading: false
@@ -29,7 +29,15 @@
 
 ## T9
 
-::: pyasic.miners.antminer.bmminer.X9.T9.BMMinerT9
+::: pyasic.miners.btc.antminer.bmminer.X9.T9.BMMinerT9
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## E9 Pro
+
+::: pyasic.miners.etc.antminer.cgminer.X9.E9_Pro.CGMinerE9Pro
     handler: python
     options:
         show_root_heading: false

docs/miners/avalonminer/A10X.md

@@ -3,7 +3,7 @@
 
 ## A1026
 
-::: pyasic.miners.avalonminer.cgminer.A10X.A1026.CGMinerAvalon1026
+::: pyasic.miners.btc.avalonminer.cgminer.A10X.A1026.CGMinerAvalon1026
     handler: python
     options:
         show_root_heading: false
@@ -11,7 +11,7 @@
 
 ## A1047
 
-::: pyasic.miners.avalonminer.cgminer.A10X.A1047.CGMinerAvalon1047
+::: pyasic.miners.btc.avalonminer.cgminer.A10X.A1047.CGMinerAvalon1047
     handler: python
     options:
         show_root_heading: false
@@ -19,7 +19,7 @@
 
 ## A1066
 
-::: pyasic.miners.avalonminer.cgminer.A10X.A1066.CGMinerAvalon1066
+::: pyasic.miners.btc.avalonminer.cgminer.A10X.A1066.CGMinerAvalon1066
     handler: python
     options:
         show_root_heading: false

docs/miners/avalonminer/A7X.md

@@ -3,7 +3,7 @@
 
 ## A721
 
-::: pyasic.miners.avalonminer.cgminer.A7X.A721.CGMinerAvalon721
+::: pyasic.miners.btc.avalonminer.cgminer.A7X.A721.CGMinerAvalon721
     handler: python
     options:
         show_root_heading: false
@@ -11,7 +11,7 @@
 
 ## A741
 
-::: pyasic.miners.avalonminer.cgminer.A7X.A741.CGMinerAvalon741
+::: pyasic.miners.btc.avalonminer.cgminer.A7X.A741.CGMinerAvalon741
     handler: python
     options:
         show_root_heading: false
@@ -19,7 +19,7 @@
 
 ## A761
 
-::: pyasic.miners.avalonminer.cgminer.A7X.A761.CGMinerAvalon761
+::: pyasic.miners.btc.avalonminer.cgminer.A7X.A761.CGMinerAvalon761
     handler: python
     options:
         show_root_heading: false

docs/miners/avalonminer/A8X.md

@@ -3,7 +3,7 @@
 
 ## A821
 
-::: pyasic.miners.avalonminer.cgminer.A8X.A821.CGMinerAvalon821
+::: pyasic.miners.btc.avalonminer.cgminer.A8X.A821.CGMinerAvalon821
     handler: python
     options:
         show_root_heading: false
@@ -11,7 +11,7 @@
 
 ## A841
 
-::: pyasic.miners.avalonminer.cgminer.A8X.A841.CGMinerAvalon841
+::: pyasic.miners.btc.avalonminer.cgminer.A8X.A841.CGMinerAvalon841
     handler: python
     options:
         show_root_heading: false
@@ -19,7 +19,7 @@
 
 ## A851
 
-::: pyasic.miners.avalonminer.cgminer.A8X.A851.CGMinerAvalon851
+::: pyasic.miners.btc.avalonminer.cgminer.A8X.A851.CGMinerAvalon851
     handler: python
     options:
         show_root_heading: false

docs/miners/avalonminer/A9X.md

@@ -3,7 +3,7 @@
 
 ## A921
 
-::: pyasic.miners.avalonminer.cgminer.A9X.A921.CGMinerAvalon921
+::: pyasic.miners.btc.avalonminer.cgminer.A9X.A921.CGMinerAvalon921
     handler: python
     options:
         show_root_heading: false

docs/miners/backends/bfgminer.md

@@ -0,0 +1,8 @@
+# pyasic
+## BFGMiner Backend
+
+::: pyasic.miners.kda._backends.bfgminer.BFGMiner
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4

docs/miners/backends/bmminer.md

@@ -1,7 +1,7 @@
 # pyasic
 ## BMMiner Backend
 
-::: pyasic.miners._backends.bmminer.BMMiner
+::: pyasic.miners.btc._backends.bmminer.BMMiner
     handler: python
     options:
         show_root_heading: false

docs/miners/backends/bosminer.md

@@ -1,7 +1,7 @@
 # pyasic
 ## BOSMiner Backend
 
-::: pyasic.miners._backends.bosminer.BOSMiner
+::: pyasic.miners.btc._backends.bosminer.BOSMiner
     handler: python
     options:
         show_root_heading: false

docs/miners/backends/btminer.md

@@ -1,7 +1,7 @@
 # pyasic
 ## BTMiner Backend
 
-::: pyasic.miners._backends.btminer.BTMiner
+::: pyasic.miners.btc._backends.btminer.BTMiner
     handler: python
     options:
         show_root_heading: false

docs/miners/backends/cgminer.md

@@ -1,7 +1,7 @@
 # pyasic
 ## CGMiner Backend
 
-::: pyasic.miners._backends.cgminer.CGMiner
+::: pyasic.miners.btc._backends.cgminer.CGMiner
     handler: python
     options:
         show_root_heading: false

docs/miners/backends/hiveon.md

@@ -1,7 +1,7 @@
 # pyasic
 ## Hiveon Backend
 
-::: pyasic.miners._backends.hiveon.Hiveon
+::: pyasic.miners.btc._backends.hiveon.Hiveon
     handler: python
     options:
         show_root_heading: false

docs/miners/goldshell/CKX.md

@@ -0,0 +1,10 @@
+# pyasic
+## CKX Models
+
+## CK5
+
+::: pyasic.miners.ckb.goldshell.bfgminer.CKX.CK5.BFGMinerCK5
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4

docs/miners/goldshell/HSX.md

@@ -0,0 +1,10 @@
+# pyasic
+## HSX Models
+
+## HS5
+
+::: pyasic.miners.hns.goldshell.bfgminer.HSX.HS5.BFGMinerHS5
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4

docs/miners/goldshell/KDX.md

@@ -0,0 +1,19 @@
+# pyasic
+## KDX Models
+
+## KD5
+
+::: pyasic.miners.kda.goldshell.bfgminer.KDX.KD5.BFGMinerKD5
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+
+## KD Max
+
+::: pyasic.miners.kda.goldshell.bfgminer.KDX.KDMax.BFGMinerKDMax
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4

docs/miners/innosilicon/A10X.md

@@ -0,0 +1,10 @@
+# pyasic
+## A10X Models
+
+## A10X
+
+::: pyasic.miners.etc.innosilicon.cgminer.A10X.A10X.CGMinerA10X
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4

docs/miners/innosilicon/T3X.md

@@ -3,7 +3,7 @@
 
 ## T3H+
 
-::: pyasic.miners.innosilicon.cgminer.T3X.T3H_Plus.CGMinerInnosiliconT3HPlus
+::: pyasic.miners.btc.innosilicon.cgminer.T3X.T3H_Plus.CGMinerInnosiliconT3HPlus
     handler: python
     options:
         show_root_heading: false

docs/miners/supported_types.md

@@ -432,6 +432,7 @@ details {
         <summary>X19 Series:</summary>
             <ul>
                 <li><a href="../antminer/X19/#s19">S19</a></li>
+                <li><a href="../antminer/X19/#s19l">S19L</a></li>
                 <li><a href="../antminer/X19/#s19-pro">S19 Pro</a></li>
                 <li><a href="../antminer/X19/#s19a">S19a</a></li>
                 <li><a href="../antminer/X19/#s19j">S19j</a></li>
@@ -453,11 +454,36 @@ details {
             </ul>
         </details>
         <details>
+        <summary>X15 Series:</summary>
+            <ul>
+                <li><a href="../antminer/X15/#z15">Z15</a></li>
+            </ul>
+        </details>
+        <details>
         <summary>X9 Series:</summary>
             <ul>
                 <li><a href="../antminer/X9/#s9">S9</a></li>
                 <li><a href="../antminer/X9/#s9i">S9i</a></li>
                 <li><a href="../antminer/X9/#t9">T9</a></li>
+                <li><a href="../antminer/X9/#e9-pro">E9 Pro</a></li>
+            </ul>
+        </details>
+        <details>
+        <summary>X7 Series:</summary>
+            <ul>
+                <li><a href="../antminer/X7/#l7">L7</a></li>
+            </ul>
+        </details>
+        <details>
+        <summary>X5 Series:</summary>
+            <ul>
+                <li><a href="../antminer/X5/#dr5">DR5</a></li>
+            </ul>
+        </details>
+        <details>
+        <summary>X3 Series:</summary>
+            <ul>
+                <li><a href="../antminer/X3/#hs3">HS3</a></li>
             </ul>
         </details>
     </ul>
@@ -506,5 +532,35 @@ details {
                 <li><a href="../innosilicon/T3X/#t3h">T3H+</a></li>
             </ul>
         </details>
+        <details>
+        <summary>A10X Series:</summary>
+            <ul>
+                <li><a href="../innosilicon/A10X/#a10x">A10X</a></li>
+            </ul>
+        </details>
+    </ul>
+</details>
+<details>
+<summary>Stock Firmware Goldshell Miners:</summary>
+    <ul>
+        <details>
+        <summary>CKX Series:</summary>
+            <ul>
+                <li><a href="../goldshell/CKX/#ck5">CK5</a></li>
+            </ul>
+        </details>
+        <details>
+        <summary>HSX Series:</summary>
+            <ul>
+                <li><a href="../goldshell/HSX/#hs5">HS5</a></li>
+            </ul>
+        </details>
+        <details>
+        <summary>KDX Series:</summary>
+            <ul>
+                <li><a href="../goldshell/KDX/#kd5">KD5</a></li>
+                <li><a href="../goldshell/KDX/#kd-max">KD Max</a></li>
+            </ul>
+        </details>
     </ul>
 </details>

docs/miners/whatsminer/M2X.md

@@ -3,7 +3,7 @@
 
 ## M20V10
 
-::: pyasic.miners.whatsminer.btminer.M2X.M20.BTMinerM20V10
+::: pyasic.miners.btc.whatsminer.btminer.M2X.M20.BTMinerM20V10
     handler: python
     options:
         show_root_heading: false
@@ -11,7 +11,7 @@
 
 ## M20SV10
 
-::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV10
+::: pyasic.miners.btc.whatsminer.btminer.M2X.M20S.BTMinerM20SV10
     handler: python
     options:
         show_root_heading: false
@@ -19,7 +19,7 @@
 
 ## M20SV20
 
-::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV20
+::: pyasic.miners.btc.whatsminer.btminer.M2X.M20S.BTMinerM20SV20
     handler: python
     options:
         show_root_heading: false
@@ -27,7 +27,7 @@
 
 ## M20SV30
 
-::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV30
+::: pyasic.miners.btc.whatsminer.btminer.M2X.M20S.BTMinerM20SV30
     handler: python
     options:
         show_root_heading: false
@@ -35,7 +35,7 @@
 
 ## M20S+V30
 
-::: pyasic.miners.whatsminer.btminer.M2X.M20S_Plus.BTMinerM20SPlusV30
+::: pyasic.miners.btc.whatsminer.btminer.M2X.M20S_Plus.BTMinerM20SPlusV30
     handler: python
     options:
         show_root_heading: false
@@ -43,7 +43,7 @@
 
 ## M21V10
 
-::: pyasic.miners.whatsminer.btminer.M2X.M21.BTMinerM21V10
+::: pyasic.miners.btc.whatsminer.btminer.M2X.M21.BTMinerM21V10
     handler: python
     options:
         show_root_heading: false
@@ -51,7 +51,7 @@
 
 ## M21SV20
 
-::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV20
+::: pyasic.miners.btc.whatsminer.btminer.M2X.M21S.BTMinerM21SV20
     handler: python
     options:
         show_root_heading: false
@@ -59,7 +59,7 @@
 
 ## M21SV60
 
-::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV60
+::: pyasic.miners.btc.whatsminer.btminer.M2X.M21S.BTMinerM21SV60
     handler: python
     options:
         show_root_heading: false
@@ -67,7 +67,7 @@
 
 ## M21SV70
 
-::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV70
+::: pyasic.miners.btc.whatsminer.btminer.M2X.M21S.BTMinerM21SV70
     handler: python
     options:
         show_root_heading: false
@@ -75,7 +75,7 @@
 
 ## M21S+V20
 
-::: pyasic.miners.whatsminer.btminer.M2X.M21S_Plus.BTMinerM21SPlusV20
+::: pyasic.miners.btc.whatsminer.btminer.M2X.M21S_Plus.BTMinerM21SPlusV20
     handler: python
     options:
         show_root_heading: false
@@ -83,7 +83,7 @@
 
 ## M29V10
 
-::: pyasic.miners.whatsminer.btminer.M2X.M29.BTMinerM29V10
+::: pyasic.miners.btc.whatsminer.btminer.M2X.M29.BTMinerM29V10
     handler: python
     options:
         show_root_heading: false

docs/miners/whatsminer/M5X.md

@@ -3,7 +3,7 @@
 
 ## M50VG30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VG30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VG30
     handler: python
     options:
         show_root_heading: false
@@ -11,7 +11,7 @@
 
 ## M50VH10
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH10
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VH10
     handler: python
     options:
         show_root_heading: false
@@ -19,7 +19,7 @@
 
 ## M50VH20
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH20
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VH20
     handler: python
     options:
         show_root_heading: false
@@ -27,7 +27,7 @@
 
 ## M50VH30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VH30
     handler: python
     options:
         show_root_heading: false
@@ -35,7 +35,7 @@
 
 ## M50VH40
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH40
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VH40
     handler: python
     options:
         show_root_heading: false
@@ -43,7 +43,7 @@
 
 ## M50VH50
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH50
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VH50
     handler: python
     options:
         show_root_heading: false
@@ -51,7 +51,7 @@
 
 ## M50VH60
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH60
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VH60
     handler: python
     options:
         show_root_heading: false
@@ -59,7 +59,7 @@
 
 ## M50VH70
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH70
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VH70
     handler: python
     options:
         show_root_heading: false
@@ -67,7 +67,7 @@
 
 ## M50VH80
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH80
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VH80
     handler: python
     options:
         show_root_heading: false
@@ -75,7 +75,7 @@
 
 ## M50VJ10
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VJ10
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VJ10
     handler: python
     options:
         show_root_heading: false
@@ -83,7 +83,7 @@
 
 ## M50VJ20
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VJ20
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VJ20
     handler: python
     options:
         show_root_heading: false
@@ -91,7 +91,7 @@
 
 ## M50VJ30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VJ30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50.BTMinerM50VJ30
     handler: python
     options:
         show_root_heading: false
@@ -99,7 +99,7 @@
 
 ## M50SVJ10
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ10
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ10
     handler: python
     options:
         show_root_heading: false
@@ -107,7 +107,7 @@
 
 ## M50SVJ20
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ20
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ20
     handler: python
     options:
         show_root_heading: false
@@ -115,7 +115,7 @@
 
 ## M50SVJ30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ30
     handler: python
     options:
         show_root_heading: false
@@ -123,7 +123,7 @@
 
 ## M50SVH10
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH10
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50S.BTMinerM50SVH10
     handler: python
     options:
         show_root_heading: false
@@ -131,7 +131,7 @@
 
 ## M50SVH20
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH20
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50S.BTMinerM50SVH20
     handler: python
     options:
         show_root_heading: false
@@ -139,7 +139,7 @@
 
 ## M50SVH30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50S.BTMinerM50SVH30
     handler: python
     options:
         show_root_heading: false
@@ -147,7 +147,7 @@
 
 ## M50SVH40
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH40
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50S.BTMinerM50SVH40
     handler: python
     options:
         show_root_heading: false
@@ -155,7 +155,7 @@
 
 ## M50SVH50
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH50
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50S.BTMinerM50SVH50
     handler: python
     options:
         show_root_heading: false
@@ -163,7 +163,7 @@
 
 ## M50S+VH30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVH30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVH30
     handler: python
     options:
         show_root_heading: false
@@ -171,7 +171,7 @@
 
 ## M50S+VH40
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVH40
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVH40
     handler: python
     options:
         show_root_heading: false
@@ -179,7 +179,7 @@
 
 ## M50S+VJ30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVJ30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVJ30
     handler: python
     options:
         show_root_heading: false
@@ -187,7 +187,7 @@
 
 ## M53VH30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M53.BTMinerM53VH30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M53.BTMinerM53VH30
     handler: python
     options:
         show_root_heading: false
@@ -195,7 +195,7 @@
 
 ## M53SVH30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M53S.BTMinerM53SVH30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M53S.BTMinerM53SVH30
     handler: python
     options:
         show_root_heading: false
@@ -203,7 +203,7 @@
 
 ## M53S+VJ30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus.BTMinerM53SPlusVJ30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M53S_Plus.BTMinerM53SPlusVJ30
     handler: python
     options:
         show_root_heading: false
@@ -211,7 +211,7 @@
 
 ## M56VH30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M56.BTMinerM56VH30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M56.BTMinerM56VH30
     handler: python
     options:
         show_root_heading: false
@@ -219,7 +219,7 @@
 
 ## M56SVH30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M56S.BTMinerM56SVH30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M56S.BTMinerM56SVH30
     handler: python
     options:
         show_root_heading: false
@@ -227,7 +227,7 @@
 
 ## M56S+VJ30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M56S_Plus.BTMinerM56SPlusVJ30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M56S_Plus.BTMinerM56SPlusVJ30
     handler: python
     options:
         show_root_heading: false
@@ -235,7 +235,7 @@
 
 ## M59VH30
 
-::: pyasic.miners.whatsminer.btminer.M5X.M59.BTMinerM59VH30
+::: pyasic.miners.btc.whatsminer.btminer.M5X.M59.BTMinerM59VH30
     handler: python
     options:
         show_root_heading: false

mkdocs.yml

@@ -8,11 +8,16 @@ nav:
       - Backends:
           - BMMiner: "miners/backends/bmminer.md"
           - BOSMiner: "miners/backends/bosminer.md"
+          - BFGMiner: "miners/backends/bfgminer.md"
           - BTMiner: "miners/backends/btminer.md"
           - CGMiner: "miners/backends/cgminer.md"
           - Hiveon: "miners/backends/hiveon.md"
       - Classes:
+          - Antminer X3: "miners/antminer/X3.md"
+          - Antminer X5: "miners/antminer/X5.md"
+          - Antminer X7: "miners/antminer/X7.md"
           - Antminer X9: "miners/antminer/X9.md"
+          - Antminer X15: "miners/antminer/X15.md"
           - Antminer X17: "miners/antminer/X17.md"
           - Antminer X19: "miners/antminer/X19.md"
           - Avalon 7X: "miners/avalonminer/A7X.md"
@@ -23,6 +28,10 @@ nav:
           - Whatsminer M3X: "miners/whatsminer/M3X.md"
           - Whatsminer M5X: "miners/whatsminer/M5X.md"
           - Innosilicon T3X: "miners/innosilicon/T3X.md"
+          - Innosilicon A10X: "miners/innosilicon/A10X.md"
+          - Goldshell CKX: "miners/goldshell/CKX.md"
+          - Goldshell HSX: "miners/goldshell/HSX.md"
+          - Goldshell KDX: "miners/goldshell/KDX.md"
   - Network:
       - Miner Network: "network/miner_network.md"
       - Miner Network Range: "network/miner_network_range.md"

pyasic/API/__init__.py

@@ -146,9 +146,10 @@ class BaseMinerAPI:
         ]
 
     def _check_commands(self, *commands):
-        allowed_commands = self.get_commands()
+        allowed_commands = self.commands
         return_commands = []
-        for command in [*commands]:
+
+        for command in commands:
             if command in allowed_commands:
                 return_commands.append(command)
             else:

pyasic/API/btminer.py

@@ -767,7 +767,7 @@ class BTMinerAPI(BaseMinerAPI):
 
         """
         return await self.send_privileged_command(
-            "adjust_power_limit", power_limit=power_limit
+            "adjust_power_limit", power_limit=str(power_limit)
         )
 
     @api_min_version("2.0.5")

pyasic/config/__init__.py

@@ -91,20 +91,7 @@ class _Pool:
         pool = {"url": self.url, "user": username, "pass": self.password}
         return pool
 
-    def as_x15(self, user_suffix: str = None) -> dict:
-        """Convert the data in this class to a dict usable by an X15 device.
-
-        Parameters:
-             user_suffix: The suffix to append to username.
-        """
-        username = self.username
-        if user_suffix:
-            username = f"{username}{user_suffix}"
-
-        pool = {"url": self.url, "user": username, "pass": self.password}
-        return pool
-
-    def as_x5(self, user_suffix: str = None) -> dict:
+    def as_x17(self, user_suffix: str = None) -> dict:
         """Convert the data in this class to a dict usable by an X5 device.
 
         Parameters:
@@ -227,33 +214,8 @@ class _PoolGroup:
             pools.append(pool.as_x19(user_suffix=user_suffix))
         return pools
 
-    def as_x15(self, user_suffix: str = None) -> dict:
-        """Convert the data in this class to a list usable by an X15 device.
 
-        Parameters:
-             user_suffix: The suffix to append to username.
-        """
-        pools = {
-            "_ant_pool1url": "",
-            "_ant_pool1user": "",
-            "_ant_pool1pw": "",
-            "_ant_pool2url": "",
-            "_ant_pool2user": "",
-            "_ant_pool2pw": "",
-            "_ant_pool3url": "",
-            "_ant_pool3user": "",
-            "_ant_pool3pw": "",
-        }
-        for idx, pool in enumerate(self.pools[:3]):
-            pools[f"_ant_pool{idx+1}url"] = pool.as_x15(user_suffix=user_suffix)["url"]
-            pools[f"_ant_pool{idx+1}user"] = pool.as_x15(user_suffix=user_suffix)[
-                "user"
-            ]
-            pools[f"_ant_pool{idx+1}pw"] = pool.as_x15(user_suffix=user_suffix)["pass"]
-
-        return pools
-
-    def as_x5(self, user_suffix: str = None) -> dict:
+    def as_x17(self, user_suffix: str = None) -> dict:
         """Convert the data in this class to a list usable by an X5 device.
 
         Parameters:
@@ -271,9 +233,9 @@ class _PoolGroup:
             "_ant_pool3pw": "",
         }
         for idx, pool in enumerate(self.pools[:3]):
-            pools[f"_ant_pool{idx+1}url"] = pool.as_x5(user_suffix=user_suffix)["url"]
-            pools[f"_ant_pool{idx+1}user"] = pool.as_x5(user_suffix=user_suffix)["user"]
-            pools[f"_ant_pool{idx+1}pw"] = pool.as_x5(user_suffix=user_suffix)["pass"]
+            pools[f"_ant_pool{idx+1}url"] = pool.as_x17(user_suffix=user_suffix)["url"]
+            pools[f"_ant_pool{idx+1}user"] = pool.as_x17(user_suffix=user_suffix)["user"]
+            pools[f"_ant_pool{idx+1}pw"] = pool.as_x17(user_suffix=user_suffix)["pass"]
 
         return pools
 
@@ -291,7 +253,17 @@ class _PoolGroup:
         Parameters:
              user_suffix: The suffix to append to username.
         """
-        pools = {}
+        pools = {
+            "Pool1": None,
+            "UserName1": None,
+            "Password1": None,
+            "Pool2": None,
+            "UserName2": None,
+            "Password2": None,
+            "Pool3": None,
+            "UserName3": None,
+            "Password3": None,
+        }
         for idx, pool in enumerate(self.pools[:3]):
             pool_data = pool.as_inno(user_suffix=user_suffix)
             for key in pool_data:
@@ -516,8 +488,14 @@ class MinerConfig:
         for group in data["pool_groups"]:
             pool_groups.append(_PoolGroup().from_dict(group))
         for key in data:
-            if hasattr(self, key) and not key == "pool_groups":
+            if (
+                hasattr(self, key)
+                and not key == "pool_groups"
+                and not key == "miner_mode"
+            ):
                 setattr(self, key, data[key])
+            if key == "miner_mode":
+                self.miner_mode = X19PowerMode(data[key])
         self.pool_groups = pool_groups
         return self
 
@@ -582,23 +560,13 @@ class MinerConfig:
 
         return cfg
 
-    def as_x15(self, user_suffix: str = None) -> dict:
-        """Convert the data in this class to a config usable by an X15 device.
-
-        Parameters:
-            user_suffix: The suffix to append to username.
-        """
-        cfg = self.pool_groups[0].as_x15(user_suffix=user_suffix)
-
-        return cfg
-
-    def as_x5(self, user_suffix: str = None) -> dict:
+    def as_x17(self, user_suffix: str = None) -> dict:
         """Convert the data in this class to a config usable by an X5 device.
 
         Parameters:
             user_suffix: The suffix to append to username.
         """
-        cfg = self.pool_groups[0].as_x5(user_suffix=user_suffix)
+        cfg = self.pool_groups[0].as_x17(user_suffix=user_suffix)
 
         return cfg
 

pyasic/data/__init__.py

@@ -259,8 +259,9 @@ class MinerData:
 
     @property
     def left_chips(self):  # noqa - Skip PyCharm inspection
-        if len(self.hashboards) in [2, 3]:
+        if len(self.hashboards) in [2, 3, 4]:
             return self.hashboards[0].chips
+
         return 0
 
     @left_chips.setter
@@ -271,7 +272,7 @@ class MinerData:
     def center_chips(self):  # noqa - Skip PyCharm inspection
         if len(self.hashboards) == 1:
             return self.hashboards[0].chips
-        if len(self.hashboards) == 3:
+        if len(self.hashboards) in [2, 3, 4]:
             return self.hashboards[1].chips
         return 0
 
@@ -285,6 +286,8 @@ class MinerData:
             return self.hashboards[1].chips
         if len(self.hashboards) == 3:
             return self.hashboards[2].chips
+        if len(self.hashboards) > 3:
+            return self.hashboards[-1:][0].chips
         return 0
 
     @right_chips.setter
@@ -293,7 +296,7 @@ class MinerData:
 
     @property
     def left_board_hashrate(self):  # noqa - Skip PyCharm inspection
-        if len(self.hashboards) in [2, 3]:
+        if len(self.hashboards) in [2, 3, 4]:
             return self.hashboards[0].hashrate
         return 0
 
@@ -305,7 +308,7 @@ class MinerData:
     def center_board_hashrate(self):  # noqa - Skip PyCharm inspection
         if len(self.hashboards) == 1:
             return self.hashboards[0].hashrate
-        if len(self.hashboards) == 3:
+        if len(self.hashboards) in [2, 3, 4]:
             return self.hashboards[1].hashrate
         return 0
 
@@ -319,6 +322,8 @@ class MinerData:
             return self.hashboards[1].hashrate
         if len(self.hashboards) == 3:
             return self.hashboards[2].hashrate
+        if len(self.hashboards) > 3:
+            return self.hashboards[-1:][0].hashrate
         return 0
 
     @right_board_hashrate.setter
@@ -327,7 +332,7 @@ class MinerData:
 
     @property
     def left_board_temp(self):  # noqa - Skip PyCharm inspection
-        if len(self.hashboards) in [2, 3]:
+        if len(self.hashboards) in [2, 3, 4]:
             return self.hashboards[0].temp
         return 0
 
@@ -339,7 +344,7 @@ class MinerData:
     def center_board_temp(self):  # noqa - Skip PyCharm inspection
         if len(self.hashboards) == 1:
             return self.hashboards[0].temp
-        if len(self.hashboards) == 3:
+        if len(self.hashboards) in [2, 3, 4]:
             return self.hashboards[1].temp
         return 0
 
@@ -353,6 +358,8 @@ class MinerData:
             return self.hashboards[1].temp
         if len(self.hashboards) == 3:
             return self.hashboards[2].temp
+        if len(self.hashboards) > 3:
+            return self.hashboards[-1:][0].temp
         return 0
 
     @right_board_temp.setter
@@ -361,7 +368,7 @@ class MinerData:
 
     @property
     def left_board_chip_temp(self):  # noqa - Skip PyCharm inspection
-        if len(self.hashboards) in [2, 3]:
+        if len(self.hashboards) in [2, 3, 4]:
             return self.hashboards[0].chip_temp
         return 0
 
@@ -373,7 +380,7 @@ class MinerData:
     def center_board_chip_temp(self):  # noqa - Skip PyCharm inspection
         if len(self.hashboards) == 1:
             return self.hashboards[0].chip_temp
-        if len(self.hashboards) == 3:
+        if len(self.hashboards) in [2, 3, 4]:
             return self.hashboards[1].chip_temp
         return 0
 
@@ -387,6 +394,8 @@ class MinerData:
             return self.hashboards[1].chip_temp
         if len(self.hashboards) == 3:
             return self.hashboards[2].chip_temp
+        if len(self.hashboards) > 3:
+            return self.hashboards[-1:][0].chip_temp
         return 0
 
     @right_board_chip_temp.setter

pyasic/load/__init__.py

@@ -143,13 +143,19 @@ class _MinerPhaseBalancer:
 
     async def get_balance_setpoints(self, wattage: int) -> dict:
         # gather data needed to optimize shutdown only miners
-        dp = ["hashrate", "wattage", "wattage_limit"]
+        dp = ["hashrate", "wattage", "wattage_limit", "hashboards"]
         data = await asyncio.gather(
             *[
                 self.miners[miner]["miner"].get_data(data_to_get=dp)
                 for miner in self.miners
             ]
         )
+        pct_ideal_list = [d.percent_ideal for d in data]
+        pct_ideal = 0
+        if len(pct_ideal_list) > 0:
+            pct_ideal = sum(pct_ideal_list) / len(pct_ideal_list)
+
+        wattage = round(wattage * 1 / (pct_ideal / 100))
 
         for data_point in data:
             if (not self.miners[data_point.ip]["tune"]) and (

pyasic/miners/btc/_backends/bosminer.py

@@ -136,7 +136,7 @@ class BOSMiner(BaseMiner):
         return False
 
     async def restart_backend(self) -> bool:
-        """Restart bosminer hashing process.  Wraps [`restart_bosminer`][pyasic.miners._backends.bosminer.BOSMiner.restart_bosminer] to standardize."""
+        """Restart bosminer hashing process.  Wraps [`restart_bosminer`][pyasic.miners.btc._backends.bosminer.BOSMiner.restart_bosminer] to standardize."""
         return await self.restart_bosminer()
 
     async def restart_bosminer(self) -> bool:

pyasic/miners/btc/_backends/cgminer.py

@@ -69,7 +69,7 @@ class CGMiner(BaseMiner):
         return result
 
     async def restart_backend(self) -> bool:
-        """Restart cgminer hashing process.  Wraps [`restart_cgminer`][pyasic.miners._backends.cgminer.CGMiner.restart_cgminer] to standardize."""
+        """Restart cgminer hashing process.  Wraps [`restart_cgminer`][pyasic.miners.btc._backends.cgminer.CGMiner.restart_cgminer] to standardize."""
         return await self.restart_cgminer()
 
     async def restart_cgminer(self) -> bool:

pyasic/miners/btc/_backends/vnish.py

@@ -138,6 +138,8 @@ class VNish(BMMiner):
         if web_settings:
             try:
                 wattage_limit = web_settings["miner"]["overclock"]["preset"]
+                if wattage_limit == "disabled":
+                    return None
                 return int(wattage_limit)
             except (KeyError, TypeError):
                 pass

pyasic/miners/btc/_types/antminer/X19/S19L.py

@@ -0,0 +1,26 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.makes import AntMiner
+
+
+class S19L(AntMiner):  # noqa - ignore ABC method implementation
+    def __init__(self, ip: str):
+        super().__init__()
+        self.ip = ip
+        self.model = "S19L"
+        self.nominal_chips = 76
+        self.fan_count = 4

pyasic/miners/btc/_types/antminer/X19/__init__.py

@@ -21,4 +21,5 @@ from .S19a import S19a
 from .S19a_Pro import S19aPro
 from .S19j import S19j
 from .S19j_Pro import S19jPro
+from .S19L import S19L
 from .T19 import T19

pyasic/miners/btc/antminer/bmminer/X19/S19L.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.btc._backends import X19  # noqa - Ignore access to _module
+from pyasic.miners.btc._types import S19L  # noqa - Ignore access to _module
+
+
+class BMMinerS19L(X19, S19L):
+    pass

pyasic/miners/btc/antminer/bmminer/X19/__init__.py

@@ -21,4 +21,5 @@ from .S19a import BMMinerS19a
 from .S19a_Pro import BMMinerS19aPro
 from .S19j import BMMinerS19j
 from .S19j_Pro import BMMinerS19jPro
+from .S19L import BMMinerS19L
 from .T19 import BMMinerT19

pyasic/miners/ckb/_backends/goldshell.py

@@ -75,7 +75,7 @@ class Goldshell(BFGMiner):
             except KeyError:
                 pass
 
-    async def get_hashboards(self, api_devs: dict = None) -> List[HashBoard]:
+    async def get_hashboards(self, api_devs: dict = None, api_devdetails: dict = None) -> List[HashBoard]:
         if not api_devs:
             try:
                 api_devs = await self.api.devs()
@@ -89,7 +89,7 @@ class Goldshell(BFGMiner):
 
         if api_devs:
             for board in api_devs["DEVS"]:
-                if board.get("ID"):
+                if board.get("ID") is not None:
                     try:
                         b_id = board["ID"]
                         hashboards[b_id].hashrate = round(board["MHS 20s"] / 1000000, 2)
@@ -98,4 +98,19 @@ class Goldshell(BFGMiner):
                     except KeyError:
                         pass
 
+        if not api_devdetails:
+            try:
+                api_devdetails = await self.api.devdetails()
+            except APIError:
+                pass
+
+        if api_devdetails:
+            for board in api_devdetails["DEVS"]:
+                if board.get("ID") is not None:
+                    try:
+                        b_id = board["ID"]
+                        hashboards[b_id].chips = board["chips-nr"]
+                    except KeyError:
+                        pass
+
         return hashboards

pyasic/miners/ckb/_types/goldshell/CK5.py

@@ -22,5 +22,5 @@ class CK5(GoldshellMiner):  # noqa - ignore ABC method implementation
         self.ip = ip
         self.model = "CK5"
         self.ideal_hashboards = 4
-        self.chip_count = 18
+        self.nominal_chips = 46
         self.fan_count = 4

pyasic/miners/dcr/_backends/X5.py

@@ -20,14 +20,14 @@ from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.errors import APIError
 from pyasic.miners.zec._backends import CGMiner  # noqa - Ignore access to _module
-from pyasic.web.X5 import X5WebAPI
+from pyasic.web.X17 import X17WebAPI
 
 
 class X5(CGMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip, api_ver=api_ver)
         self.ip = ip
-        self.web = X5WebAPI(ip)
+        self.web = X17WebAPI(ip)
 
     async def get_config(self) -> MinerConfig:
         data = await self.web.get_miner_conf()
@@ -36,7 +36,7 @@ class X5(CGMiner):
         return self.config
 
     async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
-        await self.web.set_miner_conf(config.as_x5(user_suffix=user_suffix))
+        await self.web.set_miner_conf(config.as_x17(user_suffix=user_suffix))
 
     async def get_mac(self) -> Union[str, None]:
         try:

pyasic/miners/dcr/_backends/cgminer.py

@@ -19,8 +19,6 @@ import logging
 from collections import namedtuple
 from typing import List, Optional, Tuple
 
-import asyncssh
-
 from pyasic.API.cgminer import CGMinerAPI
 from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
@@ -40,64 +38,6 @@ class CGMiner(BaseMiner):
         self.pwd = "admin"
         self.config = None
 
-    async def send_ssh_command(self, cmd: str) -> Optional[str]:
-        result = None
-
-        try:
-            conn = await self._get_ssh_connection()
-        except (asyncssh.Error, OSError):
-            return None
-
-        # open an ssh connection
-        async with conn:
-            # 3 retries
-            for i in range(3):
-                try:
-                    # run the command and get the result
-                    result = await conn.run(cmd)
-                    result = result.stdout
-
-                except Exception as e:
-                    # if the command fails, log it
-                    logging.warning(f"{self} command {cmd} error: {e}")
-
-                    # on the 3rd retry, return None
-                    if i == 3:
-                        return
-                    continue
-        # return the result, either command output or None
-        return result
-
-    async def restart_backend(self) -> bool:
-        """Restart cgminer hashing process.  Wraps [`restart_cgminer`][pyasic.miners._backends.cgminer.CGMiner.restart_cgminer] to standardize."""
-        return await self.restart_cgminer()
-
-    async def restart_cgminer(self) -> bool:
-        """Restart cgminer hashing process."""
-        commands = ["cgminer-api restart", "/usr/bin/cgminer-monitor >/dev/null 2>&1"]
-        commands = ";".join(commands)
-        try:
-            _ret = await self.send_ssh_command(commands)
-        except (asyncssh.Error, OSError):
-            return False
-        else:
-            if isinstance(_ret, str):
-                return True
-        return False
-
-    async def reboot(self) -> bool:
-        """Reboots power to the physical miner."""
-        logging.debug(f"{self}: Sending reboot command.")
-        try:
-            _ret = await self.send_ssh_command("reboot")
-        except (asyncssh.Error, OSError):
-            return False
-        else:
-            logging.debug(f"{self}: Reboot command completed.")
-            if isinstance(_ret, str):
-                return True
-        return False
-
     async def resume_mining(self) -> bool:
         return False
 
@@ -199,15 +139,6 @@ class CGMiner(BaseMiner):
 
         return self.fw_ver
 
-    async def get_hostname(self) -> Optional[str]:
-        try:
-            hn = await self.send_ssh_command("cat /proc/sys/kernel/hostname")
-        except (asyncssh.Error, OSError):
-            return None
-        if hn:
-            self.hostname = hn
-        return self.hostname
-
     async def get_hashrate(self, api_summary: dict = None) -> Optional[float]:
         # get hr from API
         if not api_summary:

pyasic/miners/etc/__init__.py

@@ -14,3 +14,4 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from .innosilicon import *
+from .antminer import *

pyasic/miners/etc/_backends/X9.py

@@ -0,0 +1,211 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from typing import List, Optional, Union
+
+from pyasic.config import MinerConfig
+from pyasic.data import Fan, HashBoard
+from pyasic.errors import APIError
+from pyasic.miners.etc._backends import CGMiner  # noqa - Ignore access to _module
+from pyasic.web.X19 import X19WebAPI
+
+
+class X9(CGMiner):
+    def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
+        super().__init__(ip, api_ver=api_ver)
+        self.ip = ip
+        self.web = X19WebAPI(ip)
+
+    async def stop_mining(self) -> bool:
+        return False
+
+    async def resume_mining(self) -> bool:
+        return False
+
+    async def get_config(self) -> MinerConfig:
+        data = await self.web.get_miner_conf()
+        if data:
+            self.config = MinerConfig().from_raw(data)
+        return self.config
+
+    async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
+        await self.web.set_miner_conf(config.as_x19(user_suffix=user_suffix))
+
+    async def get_mac(self) -> Union[str, None]:
+        try:
+            data = await self.web.get_system_info()
+            if data:
+                return data["macaddr"]
+        except KeyError:
+            pass
+
+    async def restart_backend(self) -> bool:
+        return False
+
+    async def fault_light_on(self) -> bool:
+        # this should time out, after it does do a check
+        await self.web.blink(blink=True)
+        try:
+            data = await self.web.get_blink_status()
+            if data:
+                if data["isBlinking"]:
+                    self.light = True
+        except KeyError:
+            pass
+        return self.light
+
+    async def fault_light_off(self) -> bool:
+        await self.web.blink(blink=False)
+        try:
+            data = await self.web.get_blink_status()
+            if data:
+                if not data["isBlinking"]:
+                    self.light = False
+        except KeyError:
+            pass
+        return self.light
+
+    async def reboot(self) -> bool:
+        data = await self.web.reboot()
+        if data:
+            return True
+        return False
+
+    async def get_fault_light(self, web_get_blink_status: dict = None) -> bool:
+        if self.light:
+            return self.light
+
+        if not web_get_blink_status:
+            try:
+                web_get_blink_status = await self.web.get_blink_status()
+            except APIError:
+                pass
+
+        if web_get_blink_status:
+            try:
+                self.light = web_get_blink_status["isBlinking"]
+            except KeyError:
+                pass
+        return self.light
+
+    async def get_hostname(self, web_get_system_info: dict = None) -> Optional[str]:
+        if not web_get_system_info:
+            try:
+                web_get_system_info = await self.web.get_system_info()
+            except APIError:
+                pass
+
+        if web_get_system_info:
+            try:
+                return web_get_system_info["hostname"]
+            except KeyError:
+                pass
+
+    async def get_model(self, web_get_system_info: dict = None) -> Optional[str]:
+        if self.model:
+            return self.model
+
+        if not web_get_system_info:
+            try:
+                web_get_system_info = await self.web.get_system_info()
+            except APIError:
+                pass
+
+        if web_get_system_info:
+            try:
+                return web_get_system_info["minertype"]
+            except APIError:
+                pass
+
+    async def get_fans(self, api_stats: dict = None) -> List[Fan]:
+        if not api_stats:
+            try:
+                api_stats = await self.api.stats()
+            except APIError:
+                pass
+
+        fans_data = [Fan(), Fan(), Fan(), Fan()]
+        if api_stats:
+            try:
+                fan_offset = -1
+
+                for fan_num in range(1, 8, 4):
+                    for _f_num in range(4):
+                        f = api_stats["STATS"][1].get(f"fan{fan_num + _f_num}")
+                        if f and not f == 0 and fan_offset == -1:
+                            fan_offset = fan_num + 2
+                if fan_offset == -1:
+                    fan_offset = 3
+
+                for fan in range(self.fan_count):
+                    fans_data[fan] = Fan(
+                        api_stats["STATS"][1].get(f"fan{fan_offset+fan}")
+                    )
+            except (KeyError, IndexError):
+                pass
+        return fans_data
+
+    async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
+        hashboards = []
+
+        if not api_stats:
+            try:
+                api_stats = await self.api.stats()
+            except APIError:
+                pass
+
+        if api_stats:
+            try:
+                board_offset = -1
+                boards = api_stats["STATS"]
+                if len(boards) > 1:
+                    for board_num in range(1, 16, 5):
+                        for _b_num in range(5):
+                            b = boards[1].get(f"chain_acn{board_num + _b_num}")
+
+                            if b and not b == 0 and board_offset == -1:
+                                board_offset = board_num
+                    if board_offset == -1:
+                        board_offset = 1
+
+                    for i in range(board_offset, board_offset + self.ideal_hashboards):
+                        hashboard = HashBoard(
+                            slot=i - board_offset, expected_chips=self.nominal_chips
+                        )
+
+                        chip_temp = boards[1].get(f"temp{i}")
+                        if chip_temp:
+                            hashboard.chip_temp = round(chip_temp)
+
+                        temp = boards[1].get(f"temp2_{i}")
+                        if temp:
+                            hashboard.temp = round(temp)
+
+                        hashrate = boards[1].get(f"chain_rate{i}")
+                        if hashrate:
+                            hashboard.hashrate = round(float(hashrate) / 1000, 2)
+
+                        chips = boards[1].get(f"chain_acn{i}")
+                        if chips:
+                            hashboard.chips = chips
+                            hashboard.missing = False
+                        if (not chips) or (not chips > 0):
+                            hashboard.missing = True
+                        hashboards.append(hashboard)
+            except (IndexError, KeyError, ValueError, TypeError):
+                pass
+
+        return hashboards

pyasic/miners/etc/_backends/__init__.py

@@ -13,5 +13,5 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-
 from .cgminer import CGMiner
+from .X9 import X9

pyasic/miners/etc/_types/__init__.py

@@ -13,5 +13,5 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-
 from .innosilicon import *
+from .antminer import *

pyasic/miners/etc/_types/antminer/X9/E9_Pro.py

@@ -0,0 +1,27 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.makes import AntMiner
+
+
+class E9Pro(AntMiner):  # noqa - ignore ABC method implementation
+    def __init__(self, ip: str):
+        super().__init__()
+        self.ip = ip
+        self.model = "E9Pro"
+        self.nominal_chips = 8
+        self.ideal_hashboards = 2
+        self.fan_count = 4

pyasic/miners/etc/_types/antminer/X9/__init__.py

@@ -0,0 +1,16 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from .E9_Pro import E9Pro

pyasic/miners/etc/_types/antminer/__init__.py

@@ -0,0 +1,16 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from .X9 import *

pyasic/miners/etc/antminer/__init__.py

@@ -0,0 +1,16 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from .cgminer import *

pyasic/miners/etc/antminer/cgminer/X9/E9_Pro.py

@@ -0,0 +1,21 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.etc._backends import X9  # noqa - Ignore access to _module
+from pyasic.miners.etc._types import E9Pro  # noqa - Ignore access to _module
+
+class CGMinerE9Pro(X9, E9Pro):
+    pass

pyasic/miners/etc/antminer/cgminer/X9/__init__.py

@@ -0,0 +1,16 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from .E9_Pro import CGMinerE9Pro

pyasic/miners/etc/antminer/cgminer/__init__.py

@@ -0,0 +1,16 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from .X9 import *

pyasic/miners/etc/innosilicon/cgminer/A10X/A10X.py

@@ -37,16 +37,16 @@ class CGMinerA10X(CGMiner, A10X):
     async def fault_light_off(self) -> bool:
         return False
 
-    async def get_config(self, api_pools: dict = None) -> MinerConfig:
-        if not api_pools:
+    async def get_config(self, web_pools: dict = None) -> MinerConfig:
+        if not web_pools:
             try:
-                api_pools = await self.api.pools()
+                web_pools = await self.web.pools()
             except APIError as e:
                 logging.warning(e)
 
-        if api_pools:
-            if "POOLS" in api_pools.keys():
-                cfg = MinerConfig().from_api(api_pools["POOLS"])
+        if web_pools:
+            if "pools" in web_pools.keys():
+                cfg = MinerConfig().from_raw(web_pools)
                 self.config = cfg
         return self.config
 
@@ -69,9 +69,28 @@ class CGMinerA10X(CGMiner, A10X):
     async def restart_backend(self) -> bool:
         return await self.restart_cgminer()
 
+    async def stop_mining(self) -> bool:
+        return False
+        # data = await self.web.poweroff()
+        # try:
+        #     return data["success"]
+        # except KeyError:
+        #     return False
+
+    async def resume_mining(self) -> bool:
+        return False
+        # data = await self.web.restart_cgminer()
+        # print(data)
+        # try:
+        #     return data["success"]
+        # except KeyError:
+        #     return False
+
     async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
-        self.config = config
-        await self.web.update_pools(config.as_inno(user_suffix=user_suffix))
+        pass
+        # doesnt work for some reason
+        # self.config = config
+        # await self.web.update_pools(config.as_inno(user_suffix=user_suffix))
 
     ##################################################
     ### DATA GATHERING FUNCTIONS (get_{some_data}) ###

pyasic/miners/hns/__init__.py

@@ -13,4 +13,5 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from .antminer import *
 from .goldshell import *

pyasic/miners/hns/_backends/X3.py

@@ -0,0 +1,205 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from typing import List, Optional, Union
+
+from pyasic.config import MinerConfig
+from pyasic.data import Fan, HashBoard
+from pyasic.errors import APIError
+from pyasic.miners.hns._backends import CGMiner  # noqa - Ignore access to _module
+from pyasic.web.X19 import X19WebAPI
+
+
+class X3(CGMiner):
+    def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
+        super().__init__(ip, api_ver=api_ver)
+        self.ip = ip
+        self.web = X19WebAPI(ip)
+
+    async def get_config(self) -> MinerConfig:
+        data = await self.web.get_miner_conf()
+        if data:
+            self.config = MinerConfig().from_raw(data)
+        return self.config
+
+    async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
+        await self.web.set_miner_conf(config.as_x19(user_suffix=user_suffix))
+
+    async def get_mac(self) -> Union[str, None]:
+        try:
+            data = await self.web.get_system_info()
+            if data:
+                return data["macaddr"]
+        except KeyError:
+            pass
+
+    async def restart_backend(self) -> bool:
+        return False
+
+    async def fault_light_on(self) -> bool:
+        # this should time out, after it does do a check
+        await self.web.blink(blink=True)
+        try:
+            data = await self.web.get_blink_status()
+            if data:
+                if data["isBlinking"]:
+                    self.light = True
+        except KeyError:
+            pass
+        return self.light
+
+    async def fault_light_off(self) -> bool:
+        await self.web.blink(blink=False)
+        try:
+            data = await self.web.get_blink_status()
+            if data:
+                if not data["isBlinking"]:
+                    self.light = False
+        except KeyError:
+            pass
+        return self.light
+
+    async def reboot(self) -> bool:
+        data = await self.web.reboot()
+        if data:
+            return True
+        return False
+
+    async def get_fault_light(self, web_get_blink_status: dict = None) -> bool:
+        if self.light:
+            return self.light
+
+        if not web_get_blink_status:
+            try:
+                web_get_blink_status = await self.web.get_blink_status()
+            except APIError:
+                pass
+
+        if web_get_blink_status:
+            try:
+                self.light = web_get_blink_status["isBlinking"]
+            except KeyError:
+                pass
+        return self.light
+
+    async def get_hostname(self, web_get_system_info: dict = None) -> Optional[str]:
+        if not web_get_system_info:
+            try:
+                web_get_system_info = await self.web.get_system_info()
+            except APIError:
+                pass
+
+        if web_get_system_info:
+            try:
+                return web_get_system_info["hostname"]
+            except KeyError:
+                pass
+
+    async def get_model(self, web_get_system_info: dict = None) -> Optional[str]:
+        if self.model:
+            return self.model
+
+        if not web_get_system_info:
+            try:
+                web_get_system_info = await self.web.get_system_info()
+            except APIError:
+                pass
+
+        if web_get_system_info:
+            try:
+                return web_get_system_info["minertype"]
+            except APIError:
+                pass
+
+    async def get_fans(self, api_stats: dict = None) -> List[Fan]:
+        if not api_stats:
+            try:
+                api_stats = await self.api.stats()
+            except APIError:
+                pass
+
+        fans_data = [Fan(), Fan(), Fan(), Fan()]
+        if api_stats:
+            try:
+                fan_offset = -1
+
+                for fan_num in range(1, 8, 4):
+                    for _f_num in range(4):
+                        f = api_stats["STATS"][1].get(f"fan{fan_num + _f_num}")
+                        if f and not f == 0 and fan_offset == -1:
+                            fan_offset = fan_num + 2
+                if fan_offset == -1:
+                    fan_offset = 3
+
+                for fan in range(self.fan_count):
+                    fans_data[fan] = Fan(
+                        api_stats["STATS"][1].get(f"fan{fan_offset+fan}")
+                    )
+            except (KeyError, IndexError):
+                pass
+        return fans_data
+
+    async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
+        hashboards = []
+
+        if not api_stats:
+            try:
+                api_stats = await self.api.stats()
+            except APIError:
+                pass
+
+        if api_stats:
+            try:
+                board_offset = -1
+                boards = api_stats["STATS"]
+                if len(boards) > 1:
+                    for board_num in range(1, 16, 5):
+                        for _b_num in range(5):
+                            b = boards[1].get(f"chain_acn{board_num + _b_num}")
+
+                            if b and not b == 0 and board_offset == -1:
+                                board_offset = board_num
+                    if board_offset == -1:
+                        board_offset = 1
+
+                    for i in range(board_offset, board_offset + self.ideal_hashboards):
+                        hashboard = HashBoard(
+                            slot=i - board_offset, expected_chips=self.nominal_chips
+                        )
+
+                        chip_temp = boards[1].get(f"temp{i}")
+                        if chip_temp:
+                            hashboard.chip_temp = round(chip_temp)
+
+                        temp = boards[1].get(f"temp2_{i}")
+                        if temp:
+                            hashboard.temp = round(temp)
+
+                        hashrate = boards[1].get(f"chain_rate{i}")
+                        if hashrate:
+                            hashboard.hashrate = round(float(hashrate) / 1000, 2)
+
+                        chips = boards[1].get(f"chain_acn{i}")
+                        if chips:
+                            hashboard.chips = chips
+                            hashboard.missing = False
+                        if (not chips) or (not chips > 0):
+                            hashboard.missing = True
+                        hashboards.append(hashboard)
+            except (IndexError, KeyError, ValueError, TypeError):
+                pass
+
+        return hashboards

pyasic/miners/hns/_backends/__init__.py

@@ -14,4 +14,6 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from .bfgminer import BFGMiner
+from .cgminer import CGMiner
 from .goldshell import Goldshell
+from .X3 import X3

pyasic/miners/hns/_backends/cgminer.py

@@ -0,0 +1,304 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+import ipaddress
+import logging
+from collections import namedtuple
+from typing import List, Optional, Tuple
+
+from pyasic.API.cgminer import CGMinerAPI
+from pyasic.config import MinerConfig
+from pyasic.data import Fan, HashBoard
+from pyasic.data.error_codes import MinerErrorData
+from pyasic.errors import APIError
+from pyasic.miners.base import BaseMiner
+
+
+class CGMiner(BaseMiner):
+    def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
+        super().__init__(ip)
+        self.ip = ipaddress.ip_address(ip)
+        self.api = CGMinerAPI(ip, api_ver)
+        self.api_ver = api_ver
+        self.api_type = "CGMiner"
+        self.uname = "root"
+        self.pwd = "admin"
+        self.config = None
+
+    async def resume_mining(self) -> bool:
+        return False
+
+    async def stop_mining(self) -> bool:
+        return False
+
+    async def get_config(self) -> MinerConfig:
+        api_pools = await self.api.pools()
+
+        if api_pools:
+            self.config = MinerConfig().from_api(api_pools["POOLS"])
+        return self.config
+
+    async def fault_light_off(self) -> bool:
+        return False
+
+    async def fault_light_on(self) -> bool:
+        return False
+
+    async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
+        return None
+
+    async def set_power_limit(self, wattage: int) -> bool:
+        return False
+
+    ##################################################
+    ### DATA GATHERING FUNCTIONS (get_{some_data}) ###
+    ##################################################
+
+    async def get_mac(self) -> Optional[str]:
+        return None
+
+    async def get_model(self, api_devdetails: dict = None) -> Optional[str]:
+        if self.model:
+            logging.debug(f"Found model for {self.ip}: {self.model}")
+            return self.model
+
+        if not api_devdetails:
+            try:
+                api_devdetails = await self.api.devdetails()
+            except APIError:
+                pass
+
+        if api_devdetails:
+            try:
+                self.model = api_devdetails["DEVDETAILS"][0]["Model"].replace(
+                    "Antminer ", ""
+                )
+                logging.debug(f"Found model for {self.ip}: {self.model}")
+                return self.model
+            except (TypeError, IndexError, KeyError):
+                pass
+
+        logging.warning(f"Failed to get model for miner: {self}")
+        return None
+
+    async def get_version(
+        self, api_version: dict = None
+    ) -> Tuple[Optional[str], Optional[str]]:
+        miner_version = namedtuple("MinerVersion", "api_ver fw_ver")
+        return miner_version(
+            api_ver=await self.get_api_ver(api_version=api_version),
+            fw_ver=await self.get_fw_ver(api_version=api_version),
+        )
+
+    async def get_api_ver(self, api_version: dict = None) -> Optional[str]:
+        if self.api_ver:
+            return self.api_ver
+
+        if not api_version:
+            try:
+                api_version = await self.api.version()
+            except APIError:
+                pass
+
+        if api_version:
+            try:
+                self.api_ver = api_version["VERSION"][0]["API"]
+            except (KeyError, IndexError):
+                pass
+
+        return self.api_ver
+
+    async def get_fw_ver(self, api_version: dict = None) -> Optional[str]:
+        if self.fw_ver:
+            return self.fw_ver
+
+        if not api_version:
+            try:
+                api_version = await self.api.version()
+            except APIError:
+                pass
+
+        if api_version:
+            try:
+                self.fw_ver = api_version["VERSION"][0]["CGMiner"]
+            except (KeyError, IndexError):
+                pass
+
+        return self.fw_ver
+
+    async def get_hashrate(self, api_summary: dict = None) -> Optional[float]:
+        # get hr from API
+        if not api_summary:
+            try:
+                api_summary = await self.api.summary()
+            except APIError:
+                pass
+
+        if api_summary:
+            try:
+                return round(
+                    float(float(api_summary["SUMMARY"][0]["GHS 5s"]) / 1000), 2
+                )
+            except (IndexError, KeyError, ValueError, TypeError):
+                pass
+
+    async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
+        hashboards = []
+
+        if not api_stats:
+            try:
+                api_stats = await self.api.stats()
+            except APIError:
+                pass
+
+        if api_stats:
+            try:
+                board_offset = -1
+                boards = api_stats["STATS"]
+                if len(boards) > 1:
+                    for board_num in range(1, 16, 5):
+                        for _b_num in range(5):
+                            b = boards[1].get(f"chain_acn{board_num + _b_num}")
+
+                            if b and not b == 0 and board_offset == -1:
+                                board_offset = board_num
+                    if board_offset == -1:
+                        board_offset = 1
+
+                    for i in range(board_offset, board_offset + self.ideal_hashboards):
+                        hashboard = HashBoard(
+                            slot=i - board_offset, expected_chips=self.nominal_chips
+                        )
+
+                        chip_temp = boards[1].get(f"temp{i}")
+                        if chip_temp:
+                            hashboard.chip_temp = round(chip_temp)
+
+                        temp = boards[1].get(f"temp2_{i}")
+                        if temp:
+                            hashboard.temp = round(temp)
+
+                        hashrate = boards[1].get(f"chain_rate{i}")
+                        if hashrate:
+                            hashboard.hashrate = round(float(hashrate) / 1000, 2)
+
+                        chips = boards[1].get(f"chain_acn{i}")
+                        if chips:
+                            hashboard.chips = chips
+                            hashboard.missing = False
+                        if (not chips) or (not chips > 0):
+                            hashboard.missing = True
+                        hashboards.append(hashboard)
+            except (IndexError, KeyError, ValueError, TypeError):
+                pass
+
+        return hashboards
+
+    async def get_env_temp(self) -> Optional[float]:
+        return None
+
+    async def get_wattage(self) -> Optional[int]:
+        return None
+
+    async def get_wattage_limit(self) -> Optional[int]:
+        return None
+
+    async def get_fans(self, api_stats: dict = None) -> List[Fan]:
+        if not api_stats:
+            try:
+                api_stats = await self.api.stats()
+            except APIError:
+                pass
+
+        fans_data = [Fan(), Fan(), Fan(), Fan()]
+        if api_stats:
+            try:
+                fan_offset = -1
+
+                for fan_num in range(1, 8, 4):
+                    for _f_num in range(4):
+                        f = api_stats["STATS"][1].get(f"fan{fan_num + _f_num}")
+                        if f and not f == 0 and fan_offset == -1:
+                            fan_offset = fan_num
+                if fan_offset == -1:
+                    fan_offset = 1
+
+                for fan in range(self.fan_count):
+                    fans_data[fan] = Fan(
+                        api_stats["STATS"][1].get(f"fan{fan_offset+fan}")
+                    )
+            except (KeyError, IndexError):
+                pass
+        return fans_data
+
+    async def get_fan_psu(self) -> Optional[int]:
+        return None
+
+    async def get_pools(self, api_pools: dict = None) -> List[dict]:
+        groups = []
+
+        if not api_pools:
+            try:
+                api_pools = await self.api.pools()
+            except APIError:
+                pass
+
+        if api_pools:
+            try:
+                pools = {}
+                for i, pool in enumerate(api_pools["POOLS"]):
+                    pools[f"pool_{i + 1}_url"] = (
+                        pool["URL"]
+                        .replace("stratum+tcp://", "")
+                        .replace("stratum2+tcp://", "")
+                    )
+                    pools[f"pool_{i + 1}_user"] = pool["User"]
+                    pools["quota"] = pool["Quota"] if pool.get("Quota") else "0"
+
+                groups.append(pools)
+            except KeyError:
+                pass
+        return groups
+
+    async def get_errors(self) -> List[MinerErrorData]:
+        return []
+
+    async def get_fault_light(self) -> bool:
+        return False
+
+    async def get_nominal_hashrate(self, api_stats: dict = None) -> Optional[float]:
+        # X19 method, not sure compatibility
+        if not api_stats:
+            try:
+                api_stats = await self.api.stats()
+            except APIError:
+                pass
+
+        if api_stats:
+            try:
+                ideal_rate = api_stats["STATS"][1]["total_rateideal"]
+                try:
+                    rate_unit = api_stats["STATS"][1]["rate_unit"]
+                except KeyError:
+                    rate_unit = "GH"
+                if rate_unit == "GH":
+                    return round(ideal_rate / 1000, 2)
+                if rate_unit == "MH":
+                    return round(ideal_rate / 1000000, 2)
+                else:
+                    return round(ideal_rate, 2)
+            except (KeyError, IndexError):
+                pass

pyasic/miners/hns/_backends/goldshell.py

@@ -33,13 +33,14 @@ class Goldshell(BFGMiner):
     async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
         pools_data = await self.web.pools()
         # have to delete all the pools one at a time first
-        for pool in pools_data:
-            await self.web.delpool(
-                url=pool["url"],
-                user=pool["user"],
-                password=pool["pass"],
-                dragid=pool["dragid"],
-            )
+        if pools_data:
+            for pool in pools_data:
+                await self.web.delpool(
+                    url=pool["url"],
+                    user=pool["user"],
+                    password=pool["pass"],
+                    dragid=pool["dragid"],
+                )
 
         self.config = config
 
@@ -75,7 +76,7 @@ class Goldshell(BFGMiner):
             except KeyError:
                 pass
 
-    async def get_hashboards(self, api_devs: dict = None) -> List[HashBoard]:
+    async def get_hashboards(self, api_devs: dict = None, api_devdetails: dict = None) -> List[HashBoard]:
         if not api_devs:
             try:
                 api_devs = await self.api.devs()
@@ -89,7 +90,7 @@ class Goldshell(BFGMiner):
 
         if api_devs:
             for board in api_devs["DEVS"]:
-                if board.get("ID"):
+                if board.get("ID") is not None:
                     try:
                         b_id = board["ID"]
                         hashboards[b_id].hashrate = round(board["MHS 20s"] / 1000000, 2)
@@ -98,4 +99,19 @@ class Goldshell(BFGMiner):
                     except KeyError:
                         pass
 
+        if not api_devdetails:
+            try:
+                api_devdetails = await self.api.devdetails()
+            except APIError:
+                pass
+
+        if api_devdetails:
+            for board in api_devdetails["DEVS"]:
+                if board.get("ID") is not None:
+                    try:
+                        b_id = board["ID"]
+                        hashboards[b_id].chips = board["chips-nr"]
+                    except KeyError:
+                        pass
+
         return hashboards

pyasic/miners/hns/_types/__init__.py

@@ -13,4 +13,5 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from .antminer import *
 from .goldshell import *

pyasic/miners/hns/_types/antminer/X3/HS3.py

@@ -0,0 +1,27 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.makes import AntMiner
+
+
+class HS3(AntMiner):  # noqa - ignore ABC method implementation
+    def __init__(self, ip: str):
+        super().__init__()
+        self.ip = ip
+        self.model = "HS3"
+        self.nominal_chips = 92
+        self.ideal_hashboards = 3
+        self.fan_count = 2

pyasic/miners/hns/_types/antminer/X3/__init__.py

@@ -0,0 +1,16 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from .HS3 import HS3

pyasic/miners/hns/_types/antminer/__init__.py

@@ -0,0 +1,16 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from .X3 import *

pyasic/miners/hns/_types/goldshell/HS5.py

@@ -22,5 +22,5 @@ class HS5(GoldshellMiner):  # noqa - ignore ABC method implementation
         self.ip = ip
         self.model = "HS5"
         self.ideal_hashboards = 4
-        self.chip_count = 18
+        self.nominal_chips = 46
         self.fan_count = 4

pyasic/miners/hns/antminer/__init__.py

@@ -0,0 +1,16 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from .cgminer import *

pyasic/miners/hns/antminer/cgminer/X3/HS3.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.hns._backends import X3  # noqa - Ignore access to _module
+from pyasic.miners.hns._types import HS3  # noqa - Ignore access to _module
+
+
+class CGMinerHS3(X3, HS3):
+    pass

pyasic/miners/hns/antminer/cgminer/X3/__init__.py

@@ -0,0 +1,16 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from .HS3 import CGMinerHS3

pyasic/miners/hns/antminer/cgminer/__init__.py

@@ -0,0 +1,16 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from .X3 import *

pyasic/miners/kda/_backends/goldshell.py

@@ -33,13 +33,14 @@ class Goldshell(BFGMiner):
     async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
         pools_data = await self.web.pools()
         # have to delete all the pools one at a time first
-        for pool in pools_data:
-            await self.web.delpool(
-                url=pool["url"],
-                user=pool["user"],
-                password=pool["pass"],
-                dragid=pool["dragid"],
-            )
+        if pools_data:
+            for pool in pools_data:
+                await self.web.delpool(
+                    url=pool["url"],
+                    user=pool["user"],
+                    password=pool["pass"],
+                    dragid=pool["dragid"],
+                )
 
         self.config = config
 
@@ -75,7 +76,7 @@ class Goldshell(BFGMiner):
             except KeyError:
                 pass
 
-    async def get_hashboards(self, api_devs: dict = None) -> List[HashBoard]:
+    async def get_hashboards(self, api_devs: dict = None, api_devdetails: dict = None) -> List[HashBoard]:
         if not api_devs:
             try:
                 api_devs = await self.api.devs()
@@ -89,7 +90,7 @@ class Goldshell(BFGMiner):
 
         if api_devs:
             for board in api_devs["DEVS"]:
-                if board.get("ID"):
+                if board.get("ID") is not None:
                     try:
                         b_id = board["ID"]
                         hashboards[b_id].hashrate = round(board["MHS 20s"] / 1000000, 2)
@@ -98,4 +99,19 @@ class Goldshell(BFGMiner):
                     except KeyError:
                         pass
 
+        if not api_devdetails:
+            try:
+                api_devdetails = await self.api.devdetails()
+            except APIError:
+                pass
+
+        if api_devdetails:
+            for board in api_devdetails["DEVS"]:
+                if board.get("ID") is not None:
+                    try:
+                        b_id = board["ID"]
+                        hashboards[b_id].chips = board["chips-nr"]
+                    except KeyError:
+                        pass
+
         return hashboards

pyasic/miners/kda/_types/goldshell/KD5.py

@@ -22,5 +22,5 @@ class KD5(GoldshellMiner):  # noqa - ignore ABC method implementation
         self.ip = ip
         self.model = "KD5"
         self.ideal_hashboards = 4
-        self.chip_count = 18
+        self.nominal_chips = 46
         self.fan_count = 4

pyasic/miners/kda/_types/goldshell/KDMax.py

@@ -21,6 +21,6 @@ class KDMax(GoldshellMiner):  # noqa - ignore ABC method implementation
         super().__init__()
         self.ip = ip
         self.model = "KD Max"
-        self.ideal_hashboards = 4
-        self.chip_count = 18
+        self.ideal_hashboards = 3
+        self.nominal_chips = 84
         self.fan_count = 4

pyasic/miners/ltc/_backends/X7.py

@@ -22,14 +22,14 @@ from pyasic.config import MinerConfig, X19PowerMode
 from pyasic.data import HashBoard
 from pyasic.data.error_codes import MinerErrorData, X19Error
 from pyasic.miners.btc._backends import BMMiner  # noqa - Ignore access to _module
-from pyasic.web.X7 import X7WebAPI
+from pyasic.web.X19 import X19WebAPI
 
 
 class X7(BMMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip, api_ver=api_ver)
         self.ip = ip
-        self.web = X7WebAPI(ip)
+        self.web = X19WebAPI(ip)
 
     async def get_config(self) -> MinerConfig:
         data = await self.web.get_miner_conf()
@@ -160,16 +160,19 @@ class X7(BMMiner):
         return False
 
     async def stop_mining(self) -> bool:
-        cfg = await self.get_config()
-        cfg.miner_mode = X19PowerMode.Sleep
-        await self.send_config(cfg)
-        return True
+        return False
+        # maybe in a later update
+        # cfg = await self.get_config()
+        # cfg.miner_mode = X19PowerMode.Sleep
+        # await self.send_config(cfg)
+        # return True
 
     async def resume_mining(self) -> bool:
-        cfg = await self.get_config()
-        cfg.miner_mode = X19PowerMode.Normal
-        await self.send_config(cfg)
-        return True
+        return False
+        # cfg = await self.get_config()
+        # cfg.miner_mode = X19PowerMode.Normal
+        # await self.send_config(cfg)
+        # return True
 
     async def get_hostname(self) -> Union[str, None]:
         try:

pyasic/miners/miner_factory.py

@@ -50,10 +50,18 @@ MINER_CLASSES = {
         "Default": CGMinerDR5,
         "CGMiner": CGMinerDR5,
     },
+    "ANTMINER HS3": {
+        "Default": CGMinerHS3,
+        "CGMiner": CGMinerHS3,
+    },
     "ANTMINER L7": {
         "Default": BMMinerL7,
         "BMMiner": BMMinerL7,
     },
+    "ANTMINER E9 PRO": {
+        "Default": CGMinerE9Pro,
+        "BMMiner": CGMinerE9Pro,
+    },
     "ANTMINER S9": {
         "Default": BOSMinerS9,
         "BOSMiner": BOSMinerOld,
@@ -124,6 +132,10 @@ MINER_CLASSES = {
         "CGMiner": CGMinerS19,
         "VNish": VNishS19,
     },
+    "ANTMINER S19L": {
+        "Default": BMMinerS19L,
+        "BMMiner": BMMinerS19L,
+    },
     "ANTMINER S19 PRO": {
         "Default": BMMinerS19Pro,
         "BOSMiner+": BOSMinerS19Pro,
@@ -723,6 +735,9 @@ class MinerFactory(metaclass=Singleton):
                 try:
                     if devdetails.get("DEVDETAILS"):
                         model = devdetails["DEVDETAILS"][0][_devdetails_key].upper()
+                        if " NOPIC" in model:
+                            # Braiins OS identifies some X19 differently
+                            model = model.replace(" NOPIC", "")
                         if not model == "BITMICRO":
                             break
                     elif devdetails.get("DEVS"):
@@ -949,22 +964,25 @@ class MinerFactory(metaclass=Singleton):
     @staticmethod
     async def __get_model_from_ssh(ip: ipaddress.ip_address) -> Union[str, None]:
         model = None
-        async with asyncssh.connect(
-            str(ip),
-            known_hosts=None,
-            username="root",
-            password="admin",
-            server_host_key_algs=["ssh-rsa"],
-        ) as conn:
-            board_name = None
-            cmd = await conn.run("cat /tmp/sysinfo/board_name")
-            if cmd:
-                board_name = cmd.stdout.strip()
-        if board_name == "am1-s9":
-            model = "ANTMINER S9"
-        if board_name == "am2-s17":
-            model = "ANTMINER S17"
-        return model
+        try:
+            async with asyncssh.connect(
+                str(ip),
+                known_hosts=None,
+                username="root",
+                password="admin",
+                server_host_key_algs=["ssh-rsa"],
+            ) as conn:
+                board_name = None
+                cmd = await conn.run("cat /tmp/sysinfo/board_name")
+                if cmd:
+                    board_name = cmd.stdout.strip()
+            if board_name == "am1-s9":
+                model = "ANTMINER S9"
+            if board_name == "am2-s17":
+                model = "ANTMINER S17"
+            return model
+        except ConnectionRefusedError:
+            return None
 
     @staticmethod
     async def __get_model_from_graphql(ip: ipaddress.ip_address) -> Union[str, None]:

pyasic/miners/zec/_backends/X15.py

@@ -20,14 +20,14 @@ from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.errors import APIError
 from pyasic.miners.zec._backends import CGMiner  # noqa - Ignore access to _module
-from pyasic.web.X15 import X15WebAPI
+from pyasic.web.X17 import X17WebAPI
 
 
 class X15(CGMiner):
     def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
         super().__init__(ip, api_ver=api_ver)
         self.ip = ip
-        self.web = X15WebAPI(ip)
+        self.web = X17WebAPI(ip)
 
     async def get_config(self) -> MinerConfig:
         data = await self.web.get_miner_conf()
@@ -36,7 +36,7 @@ class X15(CGMiner):
         return self.config
 
     async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
-        await self.web.set_miner_conf(config.as_x15(user_suffix=user_suffix))
+        await self.web.set_miner_conf(config.as_x17(user_suffix=user_suffix))
 
     async def get_mac(self) -> Union[str, None]:
         try:

pyasic/miners/zec/_backends/cgminer.py

@@ -19,8 +19,6 @@ import logging
 from collections import namedtuple
 from typing import List, Optional, Tuple
 
-import asyncssh
-
 from pyasic.API.cgminer import CGMinerAPI
 from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
@@ -40,93 +38,20 @@ class CGMiner(BaseMiner):
         self.pwd = "admin"
         self.config = None
 
-    async def send_ssh_command(self, cmd: str) -> Optional[str]:
-        result = None
-
-        try:
-            conn = await self._get_ssh_connection()
-        except (asyncssh.Error, OSError):
-            return None
-
-        # open an ssh connection
-        async with conn:
-            # 3 retries
-            for i in range(3):
-                try:
-                    # run the command and get the result
-                    result = await conn.run(cmd)
-                    result = result.stdout
-
-                except Exception as e:
-                    # if the command fails, log it
-                    logging.warning(f"{self} command {cmd} error: {e}")
-
-                    # on the 3rd retry, return None
-                    if i == 3:
-                        return
-                    continue
-        # return the result, either command output or None
-        return result
-
     async def restart_backend(self) -> bool:
-        """Restart cgminer hashing process.  Wraps [`restart_cgminer`][pyasic.miners._backends.cgminer.CGMiner.restart_cgminer] to standardize."""
-        return await self.restart_cgminer()
-
-    async def restart_cgminer(self) -> bool:
-        """Restart cgminer hashing process."""
-        commands = ["cgminer-api restart", "/usr/bin/cgminer-monitor >/dev/null 2>&1"]
-        commands = ";".join(commands)
-        try:
-            _ret = await self.send_ssh_command(commands)
-        except (asyncssh.Error, OSError):
-            return False
-        else:
-            if isinstance(_ret, str):
-                return True
         return False
 
+    async def get_hostname(self, *args, **kwargs) -> Optional[str]:
+        return None
+
     async def reboot(self) -> bool:
-        """Reboots power to the physical miner."""
-        logging.debug(f"{self}: Sending reboot command.")
-        try:
-            _ret = await self.send_ssh_command("reboot")
-        except (asyncssh.Error, OSError):
-            return False
-        else:
-            logging.debug(f"{self}: Reboot command completed.")
-            if isinstance(_ret, str):
-                return True
+        return False
+
+    async def stop_mining(self) -> bool:
         return False
 
     async def resume_mining(self) -> bool:
-        try:
-            commands = [
-                "mkdir -p /etc/tmp/",
-                'echo "*/3 * * * * /usr/bin/cgminer-monitor" > /etc/tmp/root',
-                "crontab -u root /etc/tmp/root",
-                "/usr/bin/cgminer-monitor >/dev/null 2>&1",
-            ]
-            commands = ";".join(commands)
-            await self.send_ssh_command(commands)
-        except (asyncssh.Error, OSError):
-            return False
-        else:
-            return True
-
-    async def stop_mining(self) -> bool:
-        try:
-            commands = [
-                "mkdir -p /etc/tmp/",
-                'echo "" > /etc/tmp/root',
-                "crontab -u root /etc/tmp/root",
-                "killall cgminer",
-            ]
-            commands = ";".join(commands)
-            await self.send_ssh_command(commands)
-        except (asyncssh.Error, OSError):
-            return False
-        else:
-            return True
+        return False
 
     async def get_config(self) -> MinerConfig:
         api_pools = await self.api.pools()
@@ -223,15 +148,6 @@ class CGMiner(BaseMiner):
 
         return self.fw_ver
 
-    async def get_hostname(self) -> Optional[str]:
-        try:
-            hn = await self.send_ssh_command("cat /proc/sys/kernel/hostname")
-        except (asyncssh.Error, OSError):
-            return None
-        if hn:
-            self.hostname = hn
-        return self.hostname
-
     async def get_hashrate(self, api_summary: dict = None) -> Optional[float]:
         # get hr from API
         if not api_summary:

pyasic/web/X15.py

@@ -1,72 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
-#  See the License for the specific language governing permissions and         -
-#  limitations under the License.                                              -
-# ------------------------------------------------------------------------------
-import json
-from typing import Union
-
-import httpx
-
-from pyasic.settings import PyasicSettings
-from pyasic.web import BaseWebAPI
-
-
-class X15WebAPI(BaseWebAPI):
-    def __init__(self, ip: str) -> None:
-        super().__init__(ip)
-        self.pwd = PyasicSettings().global_x15_password
-
-    async def send_command(
-        self,
-        command: Union[str, bytes],
-        ignore_errors: bool = False,
-        allow_warning: bool = True,
-        **parameters: Union[str, int, bool],
-    ) -> dict:
-        url = f"http://{self.ip}/cgi-bin/{command}.cgi"
-        auth = httpx.DigestAuth(self.username, self.pwd)
-        try:
-            async with httpx.AsyncClient() as client:
-                if parameters:
-                    data = await client.post(url, data=parameters, auth=auth)
-                else:
-                    data = await client.get(url, auth=auth)
-        except httpx.HTTPError:
-            pass
-        else:
-            if data.status_code == 200:
-                try:
-                    return data.json()
-                except json.decoder.JSONDecodeError:
-                    pass
-
-    async def get_system_info(self) -> dict:
-        return await self.send_command("get_system_info")
-
-    async def blink(self, blink: bool) -> dict:
-        if blink:
-            return await self.send_command("blink", action="startBlink")
-        return await self.send_command("blink", action="stopBlink")
-
-    async def reboot(self) -> dict:
-        return await self.send_command("reboot")
-
-    async def get_blink_status(self) -> dict:
-        return await self.send_command("blink", action="onPageLoaded")
-
-    async def get_miner_conf(self) -> dict:
-        return await self.send_command("get_miner_conf")
-
-    async def set_miner_conf(self, conf: dict) -> dict:
-        return await self.send_command("set_miner_conf", **conf)

pyasic/web/X17.py

@@ -64,3 +64,9 @@ class X17WebAPI(BaseWebAPI):
 
     async def get_blink_status(self) -> dict:
         return await self.send_command("blink", action="onPageLoaded")
+
+    async def get_miner_conf(self) -> dict:
+        return await self.send_command("get_miner_conf")
+
+    async def set_miner_conf(self, conf: dict) -> dict:
+        return await self.send_command("set_miner_conf", **conf)

pyasic/web/X5.py

@@ -1,72 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
-#  See the License for the specific language governing permissions and         -
-#  limitations under the License.                                              -
-# ------------------------------------------------------------------------------
-import json
-from typing import Union
-
-import httpx
-
-from pyasic.settings import PyasicSettings
-from pyasic.web import BaseWebAPI
-
-
-class X5WebAPI(BaseWebAPI):
-    def __init__(self, ip: str) -> None:
-        super().__init__(ip)
-        self.pwd = PyasicSettings().global_x5_password
-
-    async def send_command(
-        self,
-        command: Union[str, bytes],
-        ignore_errors: bool = False,
-        allow_warning: bool = True,
-        **parameters: Union[str, int, bool],
-    ) -> dict:
-        url = f"http://{self.ip}/cgi-bin/{command}.cgi"
-        auth = httpx.DigestAuth(self.username, self.pwd)
-        try:
-            async with httpx.AsyncClient() as client:
-                if parameters:
-                    data = await client.post(url, data=parameters, auth=auth)
-                else:
-                    data = await client.get(url, auth=auth)
-        except httpx.HTTPError:
-            pass
-        else:
-            if data.status_code == 200:
-                try:
-                    return data.json()
-                except json.decoder.JSONDecodeError:
-                    pass
-
-    async def get_system_info(self) -> dict:
-        return await self.send_command("get_system_info")
-
-    async def blink(self, blink: bool) -> dict:
-        if blink:
-            return await self.send_command("blink", action="startBlink")
-        return await self.send_command("blink", action="stopBlink")
-
-    async def reboot(self) -> dict:
-        return await self.send_command("reboot")
-
-    async def get_blink_status(self) -> dict:
-        return await self.send_command("blink", action="onPageLoaded")
-
-    async def get_miner_conf(self) -> dict:
-        return await self.send_command("get_miner_conf")
-
-    async def set_miner_conf(self, conf: dict) -> dict:
-        return await self.send_command("set_miner_conf", **conf)

pyasic/web/X7.py

@@ -1,99 +0,0 @@
-# ------------------------------------------------------------------------------
-#  Copyright 2022 Upstream Data Inc                                            -
-#                                                                              -
-#  Licensed under the Apache License, Version 2.0 (the "License");             -
-#  you may not use this file except in compliance with the License.            -
-#  You may obtain a copy of the License at                                     -
-#                                                                              -
-#      http://www.apache.org/licenses/LICENSE-2.0                              -
-#                                                                              -
-#  Unless required by applicable law or agreed to in writing, software         -
-#  distributed under the License is distributed on an "AS IS" BASIS,           -
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
-#  See the License for the specific language governing permissions and         -
-#  limitations under the License.                                              -
-# ------------------------------------------------------------------------------
-import json
-from typing import Union
-
-import httpx
-
-from pyasic.settings import PyasicSettings
-from pyasic.web import BaseWebAPI
-
-
-class X7WebAPI(BaseWebAPI):
-    def __init__(self, ip: str) -> None:
-        super().__init__(ip)
-        self.pwd = PyasicSettings().global_x7_password
-
-    async def send_command(
-        self,
-        command: Union[str, bytes],
-        ignore_errors: bool = False,
-        allow_warning: bool = True,
-        **parameters: Union[str, int, bool],
-    ) -> dict:
-        url = f"http://{self.ip}/cgi-bin/{command}.cgi"
-        auth = httpx.DigestAuth(self.username, self.pwd)
-        try:
-            async with httpx.AsyncClient() as client:
-                if parameters:
-                    data = await client.post(
-                        url, data=json.dumps(parameters), auth=auth  # noqa
-                    )
-                else:
-                    data = await client.get(url, auth=auth)
-        except httpx.HTTPError:
-            pass
-        else:
-            if data.status_code == 200:
-                try:
-                    return data.json()
-                except json.decoder.JSONDecodeError:
-                    pass
-
-    async def get_miner_conf(self) -> dict:
-        return await self.send_command("get_miner_conf")
-
-    async def set_miner_conf(self, conf: dict) -> dict:
-        return await self.send_command("set_miner_conf", **conf)
-
-    async def blink(self, blink: bool) -> dict:
-        if blink:
-            return await self.send_command("blink", blink="true")
-        return await self.send_command("blink", blink="false")
-
-    async def reboot(self) -> dict:
-        return await self.send_command("reboot")
-
-    async def get_system_info(self) -> dict:
-        return await self.send_command("get_system_info")
-
-    async def get_network_info(self) -> dict:
-        return await self.send_command("get_network_info")
-
-    async def summary(self) -> dict:
-        return await self.send_command("summary")
-
-    async def get_blink_status(self) -> dict:
-        return await self.send_command("get_blink_status")
-
-    async def set_network_conf(
-        self,
-        ip: str,
-        dns: str,
-        gateway: str,
-        subnet_mask: str,
-        hostname: str,
-        protocol: int,
-    ) -> dict:
-        return await self.send_command(
-            "set_network_conf",
-            ipAddress=ip,
-            ipDns=dns,
-            ipGateway=gateway,
-            ipHost=hostname,
-            ipPro=protocol,
-            ipSub=subnet_mask,
-        )

pyasic/web/inno.py

@@ -14,6 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 import json
+import urllib.parse
 import warnings
 from typing import Union
 
@@ -61,7 +62,7 @@ class InnosiliconWebAPI(BaseWebAPI):
                         f"http://{self.ip}/api/{command}",
                         headers={"Authorization": "Bearer " + self.jwt},
                         timeout=5,
-                        data=parameters,
+                        json=parameters,
                     )
                     json_data = response.json()
                     if (
@@ -104,3 +105,9 @@ class InnosiliconWebAPI(BaseWebAPI):
 
     async def get_error_detail(self):
         return await self.send_command("getErrorDetail")
+
+    async def pools(self):
+        return await self.send_command("pools")
+
+    async def poweroff(self):
+        return await self.send_command("poweroff")

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyasic"
-version = "0.32.0"
+version = "0.32.7"
 description = "A set of modules for interfacing with many common types of ASIC bitcoin miners, using both their API and SSH."
 authors = ["UpstreamData <brett@upstreamdata.ca>"]
 repository = "https://github.com/UpstreamData/pyasic"