version: bump version number.

ePIC: Add Blockminer support

.pre-commit-config.yaml

@@ -1,16 +1,16 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.5.0
     hooks:
     -   id: trailing-whitespace
     -   id: check-yaml
     -   id: check-added-large-files
 -   repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 24.3.0
     hooks:
     -   id: black
 -   repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.13.2
     hooks:
     -   id: isort
         name: isort (python)

README.md

@@ -9,7 +9,7 @@
 [![Commit Activity - master](https://img.shields.io/github/commit-activity/y/UpstreamData/pyasic)](https://github.com/UpstreamData/pyasic/commits/master/)
 
 [![Code Style - Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![Read The Docs - Docs](https://img.shields.io/readthedocs/pyasic)](https://pyasic.readthedocs.io/en/latest/)
+[![Read The Docs - Docs](https://img.shields.io/readthedocs/pyasic)](https://docs.pyasic.org)
 [![License - Apache 2.0](https://img.shields.io/github/license/UpstreamData/pyasic)](https://github.com/UpstreamData/pyasic/blob/master/LICENSE.txt)
 
 ---
@@ -17,7 +17,34 @@
 
 Welcome to `pyasic`!  `pyasic` uses an asynchronous method of communicating with ASIC miners on your network, which makes it super fast.
 
-[Click here to view supported miner types](miners/supported_types.md)
+[Click here to view supported miner types](https://docs.pyasic.org/en/latest/miners/supported_types/)
+
+---
+## Installation
+
+It is recommended to install `pyasic` in a [virtual environment](https://realpython.com/python-virtual-environments-a-primer/#what-other-popular-options-exist-aside-from-venv) to isolate it from the rest of your system. Options include:
+  - [pypoetry](https://python-poetry.org/): the reccommended way, since pyasic already uses it by default
+    ```
+    poetry install
+    ```
+  - [venv](https://docs.python.org/3/library/venv.html): included in Python standard library but has fewer features than other options
+  - [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv): [pyenv](https://github.com/pyenv/pyenv) plugin for managing virtualenvs
+    ```
+    pyenv install <python version number>
+    pyenv virtualenv <python version number> <env name>
+    pyenv activate <env name>
+    ```
+  - [conda](https://docs.conda.io/en/latest/)
+
+##### Installing `pyasic`
+
+`python -m pip install .` or `poetry install`
+
+##### Additional Developer Setup
+```
+poetry install --with dev
+pre-commit install
+```
 
 ---
 ## Getting started

docs/generate_miners.py

@@ -27,6 +27,8 @@ def backend_str(backend: MinerTypes) -> str:
     match backend:
         case MinerTypes.ANTMINER:
             return "Stock Firmware Antminers"
+        case MinerTypes.AURADINE:
+            return "Stock Firmware Auradine Miners"
         case MinerTypes.AVALONMINER:
             return "Stock Firmware Avalonminers"
         case MinerTypes.VNISH:
@@ -45,6 +47,8 @@ def backend_str(backend: MinerTypes) -> str:
             return "Stock Firmware Goldshells"
         case MinerTypes.LUX_OS:
             return "LuxOS Firmware Miners"
+        case MinerTypes.EPIC:
+            return "ePIC Firmware Miners"
 
 
 def create_url_str(mtype: str):

docs/index.md

@@ -18,6 +18,23 @@ Welcome to `pyasic`!  `pyasic` uses an asynchronous method of communicating with
 
 [Click here to view supported miner types](miners/supported_types.md)
 
+---
+## Installation
+
+It is recommended to install `pyasic` in a [virtual environment](https://realpython.com/python-virtual-environments-a-primer/#what-other-popular-options-exist-aside-from-venv) to isolate it from the rest of your system. Options include:
+  - [venv](https://docs.python.org/3/library/venv.html): included in Python standard library but has fewer features than other options
+  - [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv): [pyenv](https://github.com/pyenv/pyenv) plugin for managing virtualenvs
+    ```
+    pyenv install <python version number>
+    pyenv virtualenv <python version number> <env name>
+    pyenv activate <env name>
+    ```
+  - [conda](https://docs.conda.io/en/latest/)
+
+##### Installing `pyasic`
+
+`python -m pip install .` or `poetry install`
+
 ---
 ## Getting started
 ---
@@ -236,6 +253,7 @@ settings.update("default_antminer_password", "my_pwd")
 "factory_get_timeout": 3,
 "get_data_retries": 1,
 "api_function_timeout": 5,
+"antminer_mining_mode_as_str": False,
 "default_whatsminer_password": "admin",
 "default_innosilicon_password": "admin",
 "default_antminer_password": "root",

docs/miners/antminer/X17.md

@@ -50,49 +50,49 @@
         show_root_heading: false
         heading_level: 4
 
-## S17 (BOS)
+## S17 (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S17+ (BOS)
+## S17+ (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17Plus
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S17 Pro (BOS)
+## S17 Pro (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17Pro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S17e (BOS)
+## S17e (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17e
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T17 (BOS)
+## T17 (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T17+ (BOS)
+## T17+ (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17Plus
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T17e (BOS)
+## T17e (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17e
     handler: python
     options:

docs/miners/antminer/X19.md

@@ -85,6 +85,34 @@
         show_root_heading: false
         heading_level: 4
 
+## S19 Hydro
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19Hydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 Pro Hydro
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19ProHydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 Pro+ Hydro
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19ProPlusHydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19K Pro
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19KPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## T19
 ::: pyasic.miners.antminer.bmminer.X19.T19.BMMinerT19
     handler: python
@@ -92,49 +120,91 @@
         show_root_heading: false
         heading_level: 4
 
-## S19 (BOS)
+## S19
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19 Pro (BOS)
+## S19+
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 Pro
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19Pro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j (BOS)
+## S19a
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19a
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19a Pro
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19aPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19j
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19j
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j No PIC (BOS)
+## S19j No PIC
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jNoPIC
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j Pro (BOS)
+## S19j Pro
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jPro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j Pro (BOS)
+## S19j Pro
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jPro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T19 (BOS)
+## S19j Pro+
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jProPlus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19k Pro No PIC
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19kProNoPIC
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 XP
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19XP
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## T19
 ::: pyasic.miners.antminer.bosminer.X19.T19.BOSMinerT19
     handler: python
     options:
@@ -225,6 +295,20 @@
         show_root_heading: false
         heading_level: 4
 
+## S19j Pro+ (ePIC)
+::: pyasic.miners.antminer.epic.X19.S19.ePICS19jProPlus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19k Pro (ePIC)
+::: pyasic.miners.antminer.epic.X19.S19.ePICS19kPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## S19 XP (ePIC)
 ::: pyasic.miners.antminer.epic.X19.S19.ePICS19XP
     handler: python
@@ -232,3 +316,52 @@
         show_root_heading: false
         heading_level: 4
 
+## S19 (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 Pro (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19Pro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19j Pro (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19jPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19j Pro+ (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19jProPlus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19k Pro (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19kPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 XP (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19XP
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## T19 (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.T19.LUXMinerT19
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+

docs/miners/antminer/X21.md

@@ -0,0 +1,31 @@
+# pyasic
+## X21 Models
+
+## S21
+::: pyasic.miners.antminer.bmminer.X21.S21.BMMinerS21
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S21
+::: pyasic.miners.antminer.bosminer.X21.S21.BOSMinerS21
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S21 (ePIC)
+::: pyasic.miners.antminer.epic.X21.S21.ePICS21
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S21 (LuxOS)
+::: pyasic.miners.antminer.luxos.X21.S21.LUXMinerS21
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+

docs/miners/antminer/X3.md

@@ -29,3 +29,10 @@
         show_root_heading: false
         heading_level: 4
 
+## L3+ (VNish)
+::: pyasic.miners.antminer.vnish.X3.L3.VnishL3Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+

docs/miners/antminer/X7.md

@@ -8,3 +8,10 @@
         show_root_heading: false
         heading_level: 4
 
+## L7 (VNish)
+::: pyasic.miners.antminer.vnish.X7.L7.VnishL7
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+

docs/miners/antminer/X9.md

@@ -36,14 +36,14 @@
         show_root_heading: false
         heading_level: 4
 
-## S9 (BOS)
+## S9 (BOS+)
 ::: pyasic.miners.antminer.bosminer.X9.S9.BOSMinerS9
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T9 (Hiveon)
+## T9 (Hive)
 ::: pyasic.miners.antminer.hiveon.X9.T9.HiveonT9
     handler: python
     options:

docs/miners/auradine/AD.md

@@ -0,0 +1,24 @@
+# pyasic
+## AD Models
+
+## AT1500
+::: pyasic.miners.auradine.flux.AD.AT1.AuradineFluxAT1500
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## AT2860
+::: pyasic.miners.auradine.flux.AD.AT2.AuradineFluxAT2860
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## AT2880
+::: pyasic.miners.auradine.flux.AD.AT2.AuradineFluxAT2880
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+

docs/miners/auradine/AI.md

@@ -0,0 +1,17 @@
+# pyasic
+## AI Models
+
+## AI2500
+::: pyasic.miners.auradine.flux.AI.AI2.AuradineFluxAI2500
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## AI3680
+::: pyasic.miners.auradine.flux.AI.AI3.AuradineFluxAI3680
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+

docs/miners/auradine/AT.md

@@ -0,0 +1,17 @@
+# pyasic
+## AT Models
+
+## AD2500
+::: pyasic.miners.auradine.flux.AT.AD2.AuradineFluxAD2500
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## AD3500
+::: pyasic.miners.auradine.flux.AT.AD3.AuradineFluxAD3500
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+

docs/miners/goldshell/X5.md

@@ -21,3 +21,4 @@
     options:
         show_root_heading: false
         heading_level: 4
+

docs/miners/goldshell/XBox.md

@@ -0,0 +1,17 @@
+# pyasic
+## XBox Models
+
+## KD Box II
+::: pyasic.miners.goldshell.bfgminer.XBox.KDBox.GoldshellKDBoxII
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## KD Box Pro
+::: pyasic.miners.goldshell.bfgminer.XBox.KDBox.GoldshellKDBoxPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+

docs/miners/goldshell/XMax.md

@@ -2,8 +2,9 @@
 ## XMax Models
 
 ## KD Max
-::: pyasic.miners.goldshell.bfgminer.XMax.KDMax.KDMax
+::: pyasic.miners.goldshell.bfgminer.XMax.KDMax.GoldshellKDMax
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
+

docs/miners/innosilicon/A10X.md

@@ -7,3 +7,4 @@
     options:
         show_root_heading: false
         heading_level: 4
+

docs/miners/innosilicon/T3X.md

@@ -7,3 +7,4 @@
     options:
         show_root_heading: false
         heading_level: 4
+

docs/miners/supported_types.md

@@ -78,9 +78,19 @@ details {
                     <li><a href="../antminer/X19#s19-xp">S19 XP</a></li>
                     <li><a href="../antminer/X19#s19a">S19a</a></li>
                     <li><a href="../antminer/X19#s19a-pro">S19a Pro</a></li>
+                    <li><a href="../antminer/X19#s19-hydro">S19 Hydro</a></li>
+                    <li><a href="../antminer/X19#s19-pro-hydro">S19 Pro Hydro</a></li>
+                    <li><a href="../antminer/X19#s19-pro_1-hydro">S19 Pro+ Hydro</a></li>
+                    <li><a href="../antminer/X19#s19k-pro">S19K Pro</a></li>
                     <li><a href="../antminer/X19#t19">T19</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>X21 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X21#s21">S21</a></li>
+                </ul>
+        </details>
     </ul>
 </details>
 <details>
@@ -286,13 +296,39 @@ details {
                     <li><a href="../whatsminer/M5X#m50s_1_1-vk30">M50S++ VK30</a></li>
                     <li><a href="../whatsminer/M5X#m53-vh30">M53 VH30</a></li>
                     <li><a href="../whatsminer/M5X#m53s-vh30">M53S VH30</a></li>
+                    <li><a href="../whatsminer/M5X#m53s-vj40">M53S VJ40</a></li>
                     <li><a href="../whatsminer/M5X#m53s_1-vj30">M53S+ VJ30</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1_1-vk10">M53S++ VK10</a></li>
                     <li><a href="../whatsminer/M5X#m56-vh30">M56 VH30</a></li>
                     <li><a href="../whatsminer/M5X#m56s-vh30">M56S VH30</a></li>
                     <li><a href="../whatsminer/M5X#m56s_1-vj30">M56S+ VJ30</a></li>
                     <li><a href="../whatsminer/M5X#m59-vh30">M59 VH30</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>M6X Series:</summary>
+                <ul>
+                    <li><a href="../whatsminer/M6X#m60-vk10">M60 VK10</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vk20">M60 VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vk30">M60 VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vk40">M60 VK40</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk10">M60S VK10</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk20">M60S VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk30">M60S VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk40">M60S VK40</a></li>
+                    <li><a href="../whatsminer/M6X#m63-vk10">M63 VK10</a></li>
+                    <li><a href="../whatsminer/M6X#m63-vk20">M63 VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m63-vk30">M63 VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vk10">M63S VK10</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vk20">M63S VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vk30">M63S VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m66-vk20">M66 VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m66-vk30">M66 VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vk20">M66S VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vk30">M66S VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vk40">M66S VK40</a></li>
+                </ul>
+        </details>
     </ul>
 </details>
 <details>
@@ -376,6 +412,13 @@ details {
                     <li><a href="../goldshell/XMax#kd-max">KD Max</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>XBox Series:</summary>
+                <ul>
+                    <li><a href="../goldshell/XBox#kd-box-ii">KD Box II</a></li>
+                    <li><a href="../goldshell/XBox#kd-box-pro">KD Box Pro</a></li>
+                </ul>
+        </details>
     </ul>
 </details>
 <details>
@@ -384,31 +427,43 @@ details {
         <details>
             <summary>X9 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X9#s9-bos">S9 (BOS)</a></li>
+                    <li><a href="../antminer/X9#s9-bos_1">S9 (BOS+)</a></li>
                 </ul>
         </details>
         <details>
             <summary>X17 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X17#s17-bos">S17 (BOS)</a></li>
+                    <li><a href="../antminer/X17#s17-bos_1">S17 (BOS+)</a></li>
-                    <li><a href="../antminer/X17#s17_1-bos">S17+ (BOS)</a></li>
+                    <li><a href="../antminer/X17#s17_1-bos_1">S17+ (BOS+)</a></li>
-                    <li><a href="../antminer/X17#s17-pro-bos">S17 Pro (BOS)</a></li>
+                    <li><a href="../antminer/X17#s17-pro-bos_1">S17 Pro (BOS+)</a></li>
-                    <li><a href="../antminer/X17#s17e-bos">S17e (BOS)</a></li>
+                    <li><a href="../antminer/X17#s17e-bos_1">S17e (BOS+)</a></li>
-                    <li><a href="../antminer/X17#t17-bos">T17 (BOS)</a></li>
+                    <li><a href="../antminer/X17#t17-bos_1">T17 (BOS+)</a></li>
-                    <li><a href="../antminer/X17#t17_1-bos">T17+ (BOS)</a></li>
+                    <li><a href="../antminer/X17#t17_1-bos_1">T17+ (BOS+)</a></li>
-                    <li><a href="../antminer/X17#t17e-bos">T17e (BOS)</a></li>
+                    <li><a href="../antminer/X17#t17e-bos_1">T17e (BOS+)</a></li>
                 </ul>
         </details>
         <details>
             <summary>X19 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X19#s19-bos">S19 (BOS)</a></li>
+                    <li><a href="../antminer/X19#s19">S19</a></li>
-                    <li><a href="../antminer/X19#s19-pro-bos">S19 Pro (BOS)</a></li>
+                    <li><a href="../antminer/X19#s19_1">S19+</a></li>
-                    <li><a href="../antminer/X19#s19j-bos">S19j (BOS)</a></li>
+                    <li><a href="../antminer/X19#s19-pro">S19 Pro</a></li>
-                    <li><a href="../antminer/X19#s19j-no-pic-bos">S19j No PIC (BOS)</a></li>
+                    <li><a href="../antminer/X19#s19a">S19a</a></li>
-                    <li><a href="../antminer/X19#s19j-pro-bos">S19j Pro (BOS)</a></li>
+                    <li><a href="../antminer/X19#s19a-pro">S19a Pro</a></li>
-                    <li><a href="../antminer/X19#s19j-pro-bos">S19j Pro (BOS)</a></li>
+                    <li><a href="../antminer/X19#s19j">S19j</a></li>
-                    <li><a href="../antminer/X19#t19-bos">T19 (BOS)</a></li>
+                    <li><a href="../antminer/X19#s19j-no-pic">S19j No PIC</a></li>
+                    <li><a href="../antminer/X19#s19j-pro">S19j Pro</a></li>
+                    <li><a href="../antminer/X19#s19j-pro">S19j Pro</a></li>
+                    <li><a href="../antminer/X19#s19j-pro_1">S19j Pro+</a></li>
+                    <li><a href="../antminer/X19#s19k-pro-no-pic">S19k Pro No PIC</a></li>
+                    <li><a href="../antminer/X19#s19-xp">S19 XP</a></li>
+                    <li><a href="../antminer/X19#t19">T19</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>X21 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X21#s21">S21</a></li>
                 </ul>
         </details>
     </ul>
@@ -420,6 +475,13 @@ details {
             <summary>X3 Series:</summary>
                 <ul>
                     <li><a href="../antminer/X3#l3_1-vnish">L3+ (VNish)</a></li>
+                    <li><a href="../antminer/X3#l3_1-vnish">L3+ (VNish)</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>X7 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X7#l7-vnish">L7 (VNish)</a></li>
                 </ul>
         </details>
         <details>
@@ -454,9 +516,23 @@ details {
                     <li><a href="../antminer/X19#s19-pro-epic">S19 Pro (ePIC)</a></li>
                     <li><a href="../antminer/X19#s19j-epic">S19j (ePIC)</a></li>
                     <li><a href="../antminer/X19#s19j-pro-epic">S19j Pro (ePIC)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro_1-epic">S19j Pro+ (ePIC)</a></li>
+                    <li><a href="../antminer/X19#s19k-pro-epic">S19k Pro (ePIC)</a></li>
                     <li><a href="../antminer/X19#s19-xp-epic">S19 XP (ePIC)</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>X21 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X21#s21-epic">S21 (ePIC)</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>blockminer Series:</summary>
+                <ul>
+                    <li><a href="../blockminer/blockminer#blockminer-520i-epic">BlockMiner 520i (ePIC)</a></li>
+                </ul>
+        </details>
     </ul>
 </details>
 <details>
@@ -465,7 +541,7 @@ details {
         <details>
             <summary>X9 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X9#t9-hiveon">T9 (Hiveon)</a></li>
+                    <li><a href="../antminer/X9#t9-hive">T9 (Hive)</a></li>
                 </ul>
         </details>
     </ul>
@@ -479,5 +555,50 @@ details {
                     <li><a href="../antminer/X9#s9-luxos">S9 (LuxOS)</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>X19 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X19#s19-luxos">S19 (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#s19-pro-luxos">S19 Pro (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro-luxos">S19j Pro (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro_1-luxos">S19j Pro+ (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#s19k-pro-luxos">S19k Pro (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#s19-xp-luxos">S19 XP (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#t19-luxos">T19 (LuxOS)</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>X21 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X21#s21-luxos">S21 (LuxOS)</a></li>
+                </ul>
+        </details>
+    </ul>
+</details>
+<details>
+<summary>Stock Firmware Auradine Miners:</summary>
+    <ul>
+        <details>
+            <summary>AD Series:</summary>
+                <ul>
+                    <li><a href="../auradine/AD#at1500">AT1500</a></li>
+                    <li><a href="../auradine/AD#at2860">AT2860</a></li>
+                    <li><a href="../auradine/AD#at2880">AT2880</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>AI Series:</summary>
+                <ul>
+                    <li><a href="../auradine/AI#ai2500">AI2500</a></li>
+                    <li><a href="../auradine/AI#ai3680">AI3680</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>AT Series:</summary>
+                <ul>
+                    <li><a href="../auradine/AT#ad2500">AD2500</a></li>
+                    <li><a href="../auradine/AT#ad3500">AD3500</a></li>
+                </ul>
+        </details>
     </ul>
 </details>

docs/miners/whatsminer/M5X.md

@@ -211,6 +211,13 @@
         show_root_heading: false
         heading_level: 4
 
+## M53S VJ40
+::: pyasic.miners.whatsminer.btminer.M5X.M53S.BTMinerM53SVJ40
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## M53S+ VJ30
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus.BTMinerM53SPlusVJ30
     handler: python
@@ -218,6 +225,13 @@
         show_root_heading: false
         heading_level: 4
 
+## M53S++ VK10
+::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus_Plus.BTMinerM53SPlusPlusVK10
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## M56 VH30
 ::: pyasic.miners.whatsminer.btminer.M5X.M56.BTMinerM56VH30
     handler: python

docs/miners/whatsminer/M6X.md

@@ -0,0 +1,136 @@
+# pyasic
+## M6X Models
+
+## M60 VK10
+::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK10
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60 VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60 VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60 VK40
+::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK40
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60S VK10
+::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK10
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60S VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60S VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60S VK40
+::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK40
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63 VK10
+::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK10
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63 VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63 VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63S VK10
+::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK10
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63S VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63S VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M66 VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M66.BTMinerM66VK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M66 VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M66.BTMinerM66VK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M66S VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M66S VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M66S VK40
+::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK40
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+

docs/settings/settings.md

@@ -12,6 +12,7 @@ Settings options:
 - `factory_get_timeout`
 - `get_data_retries`
 - `api_function_timeout`
+- `antminer_mining_mode_as_str`
 - `default_whatsminer_password`
 - `default_innosilicon_password`
 - `default_antminer_password`

mkdocs.yml

@@ -40,6 +40,7 @@ nav:
         - Antminer X15: "miners/antminer/X15.md"
         - Antminer X17: "miners/antminer/X17.md"
         - Antminer X19: "miners/antminer/X19.md"
+        - Antminer X21: "miners/antminer/X21.md"
         - Avalon 7X: "miners/avalonminer/A7X.md"
         - Avalon 8X: "miners/avalonminer/A8X.md"
         - Avalon 9X: "miners/avalonminer/A9X.md"

pyasic/config/fans.py

@@ -54,9 +54,9 @@ class FanModeNormal(MinerConfigValue):
         return {
             "fans": {
                 "Auto": {
-                    "Idle Speed": self.minimum_speed
+                    "Idle Speed": (
-                    if not self.minimum_speed == 0
+                        self.minimum_speed if not self.minimum_speed == 0 else 100
-                    else 100
+                    )
                 }
             }
         }
@@ -96,7 +96,7 @@ class FanModeManual(MinerConfigValue):
         return cls(**cls_conf)
 
     def as_am_modern(self) -> dict:
-        return {"bitmain-fan-ctrl": True, "bitmain-fan-pwn": str(self.speed)}
+        return {"bitmain-fan-ctrl": True, "bitmain-fan-pwm": str(self.speed)}
 
     def as_bosminer(self) -> dict:
         return {
@@ -120,7 +120,7 @@ class FanModeImmersion(MinerConfigValue):
         return cls()
 
     def as_am_modern(self) -> dict:
-        return {"bitmain-fan-ctrl": True, "bitmain-fan-pwn": "0"}
+        return {"bitmain-fan-ctrl": True, "bitmain-fan-pwm": "0"}
 
     def as_bosminer(self) -> dict:
         return {"temp_control": {"mode": "disabled"}}
@@ -156,7 +156,10 @@ class FanModeConfig(MinerConfigOption):
         if web_conf.get("bitmain-fan-ctrl") is not None:
             fan_manual = web_conf["bitmain-fan-ctrl"]
             if fan_manual:
-                return cls.manual(speed=web_conf["bitmain-fan-pwm"])
+                speed = int(web_conf["bitmain-fan-pwm"])
+                if speed == 0:
+                    return cls.immersion()
+                return cls.manual(speed=speed)
             else:
                 return cls.normal()
         else:

pyasic/config/mining.py

@@ -17,6 +17,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 
+from pyasic import settings
 from pyasic.config.base import MinerConfigOption, MinerConfigValue
 from pyasic.web.braiins_os.proto.braiins.bos.v1 import (
     HashrateTargetMode,
@@ -39,7 +40,9 @@ class MiningModeNormal(MinerConfigValue):
         return cls()
 
     def as_am_modern(self) -> dict:
-        return {"miner-mode": "0"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}
 
     def as_wm(self) -> dict:
         return {"mode": self.mode}
@@ -50,6 +53,9 @@ class MiningModeNormal(MinerConfigValue):
     def as_epic(self) -> dict:
         return {"ptune": {"enabled": False}}
 
+    def as_goldshell(self) -> dict:
+        return {"settings": {"level": 0}}
+
 
 @dataclass
 class MiningModeSleep(MinerConfigValue):
@@ -60,7 +66,9 @@ class MiningModeSleep(MinerConfigValue):
         return cls()
 
     def as_am_modern(self) -> dict:
-        return {"miner-mode": "1"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "1"}
+        return {"miner-mode": 1}
 
     def as_wm(self) -> dict:
         return {"mode": self.mode}
@@ -71,6 +79,9 @@ class MiningModeSleep(MinerConfigValue):
     def as_epic(self) -> dict:
         return {"ptune": {"algo": "Sleep", "target": 0}}
 
+    def as_goldshell(self) -> dict:
+        return {"settings": {"level": 3}}
+
 
 @dataclass
 class MiningModeLPM(MinerConfigValue):
@@ -81,7 +92,9 @@ class MiningModeLPM(MinerConfigValue):
         return cls()
 
     def as_am_modern(self) -> dict:
-        return {"miner-mode": "3"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "3"}
+        return {"miner-mode": 3}
 
     def as_wm(self) -> dict:
         return {"mode": self.mode}
@@ -89,6 +102,9 @@ class MiningModeLPM(MinerConfigValue):
     def as_auradine(self) -> dict:
         return {"mode": {"mode": "eco"}}
 
+    def as_goldshell(self) -> dict:
+        return {"settings": {"level": 1}}
+
 
 @dataclass
 class MiningModeHPM(MinerConfigValue):
@@ -99,7 +115,9 @@ class MiningModeHPM(MinerConfigValue):
         return cls()
 
     def as_am_modern(self) -> dict:
-        return {"miner-mode": "0"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}
 
     def as_wm(self) -> dict:
         return {"mode": self.mode}
@@ -108,31 +126,31 @@ class MiningModeHPM(MinerConfigValue):
         return {"mode": {"mode": "turbo"}}
 
 
-class StandardPowerTuneAlgo(MinerConfigValue):
+class StandardTuneAlgo(MinerConfigValue):
     mode: str = field(init=False, default="standard")
 
     def as_epic(self) -> str:
-        return VOptPowerTuneAlgo().as_epic()
+        return VOptAlgo().as_epic()
 
 
-class VOptPowerTuneAlgo(MinerConfigValue):
+class VOptAlgo(MinerConfigValue):
     mode: str = field(init=False, default="standard")
 
     def as_epic(self) -> str:
         return "VoltageOptimizer"
 
 
-class ChipTunePowerTuneAlgo(MinerConfigValue):
+class ChipTuneAlgo(MinerConfigValue):
     mode: str = field(init=False, default="standard")
 
     def as_epic(self) -> str:
         return "ChipTune"
 
 
-class PowerTunerAlgo(MinerConfigOption):
+class TunerAlgo(MinerConfigOption):
-    standard = StandardPowerTuneAlgo
+    standard = StandardTuneAlgo
-    voltage_optimizer = VOptPowerTuneAlgo
+    voltage_optimizer = VOptAlgo
-    chip_tune = ChipTunePowerTuneAlgo
+    chip_tune = ChipTuneAlgo
 
     @classmethod
     def default(cls):
@@ -143,7 +161,7 @@ class PowerTunerAlgo(MinerConfigOption):
 class MiningModePowerTune(MinerConfigValue):
     mode: str = field(init=False, default="power_tuning")
     power: int = None
-    algo: PowerTunerAlgo = field(default_factory=PowerTunerAlgo.default)
+    algo: TunerAlgo = field(default_factory=TunerAlgo.default)
 
     @classmethod
     def from_dict(cls, dict_conf: dict | None) -> "MiningModePowerTune":
@@ -156,7 +174,9 @@ class MiningModePowerTune(MinerConfigValue):
         return cls(**cls_conf)
 
     def as_am_modern(self) -> dict:
-        return {"miner-mode": "0"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}
 
     def as_wm(self) -> dict:
         if self.power is not None:
@@ -164,7 +184,10 @@ class MiningModePowerTune(MinerConfigValue):
         return {}
 
     def as_bosminer(self) -> dict:
-        return {"autotuning": {"enabled": True, "psu_power_limit": self.power}}
+        conf = {"enabled": True, "mode": "power_target"}
+        if self.power is not None:
+            conf["power_target"] = self.power
+        return {"autotuning": conf}
 
     def as_boser(self) -> dict:
         return {
@@ -183,21 +206,27 @@ class MiningModePowerTune(MinerConfigValue):
     def as_auradine(self) -> dict:
         return {"mode": {"mode": "custom", "tune": "power", "power": self.power}}
 
-    def as_epic(self) -> dict:
-        return {"ptune": {"algo": self.algo.as_epic(), "target": self.power}}
-
 
 @dataclass
 class MiningModeHashrateTune(MinerConfigValue):
     mode: str = field(init=False, default="hashrate_tuning")
     hashrate: int = None
+    algo: TunerAlgo = field(default_factory=TunerAlgo.default)
 
     @classmethod
     def from_dict(cls, dict_conf: dict | None) -> "MiningModeHashrateTune":
         return cls(dict_conf.get("hashrate"))
 
     def as_am_modern(self) -> dict:
-        return {"miner-mode": "0"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}
+
+    def as_bosminer(self) -> dict:
+        conf = {"enabled": True, "mode": "hashrate_target"}
+        if self.hashrate is not None:
+            conf["hashrate_target"] = self.hashrate
+        return {"autotuning": conf}
 
     def as_boser(self) -> dict:
         return {
@@ -218,6 +247,9 @@ class MiningModeHashrateTune(MinerConfigValue):
     def as_auradine(self) -> dict:
         return {"mode": {"mode": "custom", "tune": "ths", "ths": self.hashrate}}
 
+    def as_epic(self) -> dict:
+        return {"ptune": {"algo": self.algo.as_epic(), "target": self.hashrate}}
+
 
 @dataclass
 class ManualBoardSettings(MinerConfigValue):
@@ -229,7 +261,9 @@ class ManualBoardSettings(MinerConfigValue):
         return cls(freq=dict_conf["freq"], volt=dict_conf["volt"])
 
     def as_am_modern(self) -> dict:
-        return {"miner-mode": "0"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}
 
 
 @dataclass
@@ -249,7 +283,9 @@ class MiningModeManual(MinerConfigValue):
         )
 
     def as_am_modern(self) -> dict:
-        return {"miner-mode": "0"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}
 
     @classmethod
     def from_vnish(cls, web_overclock_settings: dict) -> "MiningModeManual":
@@ -313,14 +349,14 @@ class MiningModeConfig(MinerConfigOption):
             if tuner_running:
                 algo_info = web_conf["PerpetualTune"]["Algorithm"]
                 if algo_info.get("VoltageOptimizer") is not None:
-                    return cls.power_tuning(
+                    return cls.hashrate_tuning(
-                        power=algo_info["VoltageOptimizer"]["Target"],
+                        hashrate=algo_info["VoltageOptimizer"]["Target"],
-                        algo=PowerTunerAlgo.voltage_optimizer,
+                        algo=TunerAlgo.voltage_optimizer,
                     )
                 else:
-                    return cls.power_tuning(
+                    return cls.hashrate_tuning(
-                        power=algo_info["ChipTune"]["Target"],
+                        hashrate=algo_info["ChipTune"]["Target"],
-                        algo=PowerTunerAlgo.chip_tune,
+                        algo=TunerAlgo.chip_tune,
                     )
             else:
                 return cls.normal()

pyasic/config/pools.py

@@ -327,9 +327,11 @@ class PoolGroup(MinerConfigValue):
             return cls(
                 pools=[Pool.from_boser(p) for p in grpc_pool_group["pools"]],
                 name=grpc_pool_group["name"],
-                quota=grpc_pool_group["quota"]["value"]
+                quota=(
-                if grpc_pool_group.get("quota") is not None
+                    grpc_pool_group["quota"]["value"]
-                else 1,
+                    if grpc_pool_group.get("quota") is not None
+                    else 1
+                ),
             )
         except LookupError:
             return cls()

pyasic/config/power_scaling.py

@@ -114,6 +114,8 @@ class PowerScalingEnabled(MinerConfigValue):
     def from_bosminer(cls, power_scaling_conf: dict) -> "PowerScalingEnabled":
         power_step = power_scaling_conf.get("power_step")
         min_power = power_scaling_conf.get("min_psu_power_limit")
+        if min_power is None:
+            min_power = power_scaling_conf.get("min_power_target")
         sd_mode = PowerScalingShutdown.from_bosminer(power_scaling_conf)
 
         return cls(
@@ -138,12 +140,12 @@ class PowerScalingEnabled(MinerConfigValue):
         if self.power_step is not None:
             cfg["power_step"] = self.power_step
         if self.minimum_power is not None:
-            cfg["min_psu_power_limit"] = self.minimum_power
+            cfg["min_power_target"] = self.minimum_power
 
         if self.shutdown_enabled is not None:
             cfg = {**cfg, **self.shutdown_enabled.as_bosminer()}
 
-        return {"power_scaling": cfg}
+        return {"performance_scaling": cfg}
 
     def as_boser(self) -> dict:
         return {
@@ -189,6 +191,8 @@ class PowerScalingConfig(MinerConfigOption):
     @classmethod
     def from_bosminer(cls, toml_conf: dict):
         power_scaling = toml_conf.get("power_scaling")
+        if power_scaling is None:
+            power_scaling = toml_conf.get("performance_scaling")
         if power_scaling is not None:
             enabled = power_scaling.get("enabled")
             if enabled is not None:

pyasic/data/__init__.py

@@ -94,9 +94,7 @@ class MinerData:
     percent_expected_wattage: float = field(init=False)
     nominal: bool = field(init=False)
     config: MinerConfig = None
-    errors: List[
+    errors: List[Union[WhatsminerError, BraiinsOSError, X19Error, InnosiliconError]] = field(default_factory=list)
-        Union[WhatsminerError, BraiinsOSError, X19Error, InnosiliconError]
-    ] = field(default_factory=list)
     fault_light: Union[bool, None] = None
     efficiency: int = field(init=False)
     is_mining: bool = True

pyasic/miners/antminer/bmminer/X19/S19.py

@@ -21,6 +21,7 @@ from pyasic.miners.models import (
     S19XP,
     S19a,
     S19aPro,
+    S19Hydro,
     S19i,
     S19j,
     S19jNoPIC,
@@ -29,6 +30,8 @@ from pyasic.miners.models import (
     S19Pro,
     S19ProHydro,
     S19ProPlus,
+    S19ProPlusHydro,
+    S19KPro,
 )
 
 
@@ -82,3 +85,15 @@ class BMMinerS19L(AntminerModern, S19L):
 
 class BMMinerS19ProHydro(AntminerModern, S19ProHydro):
     pass
+
+
+class BMMinerS19Hydro(AntminerModern, S19Hydro):
+    pass
+
+
+class BMMinerS19ProPlusHydro(AntminerModern, S19ProPlusHydro):
+    pass
+
+
+class BMMinerS19KPro(AntminerModern, S19KPro):
+    pass

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

@@ -18,6 +18,7 @@ from .S19 import (
     BMMinerS19,
     BMMinerS19a,
     BMMinerS19aPro,
+    BMMinerS19Hydro,
     BMMinerS19i,
     BMMinerS19j,
     BMMinerS19jNoPIC,
@@ -27,6 +28,8 @@ from .S19 import (
     BMMinerS19Pro,
     BMMinerS19ProHydro,
     BMMinerS19ProPlus,
+    BMMinerS19ProPlusHydro,
     BMMinerS19XP,
+    BMMinerS19KPro,
 )
 from .T19 import BMMinerT19

pyasic/miners/antminer/bmminer/X21/S21.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.backends import AntminerModern
+from pyasic.miners.models import S21
+
+
+class BMMinerS21(AntminerModern, S21):
+    pass

pyasic/miners/antminer/bmminer/X21/__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 .S21 import BMMinerS21

pyasic/miners/antminer/bmminer/__init__.py

@@ -18,3 +18,4 @@ from .X7 import *
 from .X9 import *
 from .X17 import *
 from .X19 import *
+from .X21 import *

pyasic/miners/antminer/bosminer/X17/S17.py

@@ -14,21 +14,21 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.backends import BOSer
+from pyasic.miners.backends import BOSMiner
 from pyasic.miners.models import S17, S17e, S17Plus, S17Pro
 
 
-class BOSMinerS17(BOSer, S17):
+class BOSMinerS17(BOSMiner, S17):
     pass
 
 
-class BOSMinerS17Plus(BOSer, S17Plus):
+class BOSMinerS17Plus(BOSMiner, S17Plus):
     pass
 
 
-class BOSMinerS17Pro(BOSer, S17Pro):
+class BOSMinerS17Pro(BOSMiner, S17Pro):
     pass
 
 
-class BOSMinerS17e(BOSer, S17e):
+class BOSMinerS17e(BOSMiner, S17e):
     pass

pyasic/miners/antminer/bosminer/X17/T17.py

@@ -14,17 +14,17 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from pyasic.miners.backends import BOSer
+from pyasic.miners.backends import BOSMiner
 from pyasic.miners.models import T17, T17e, T17Plus
 
 
-class BOSMinerT17(BOSer, T17):
+class BOSMinerT17(BOSMiner, T17):
     pass
 
 
-class BOSMinerT17Plus(BOSer, T17Plus):
+class BOSMinerT17Plus(BOSMiner, T17Plus):
     pass
 
 
-class BOSMinerT17e(BOSer, T17e):
+class BOSMinerT17e(BOSMiner, T17e):
     pass

pyasic/miners/antminer/bosminer/X21/S21.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.backends import BOSer
+from pyasic.miners.models import S21
+
+
+class BOSMinerS21(BOSer, S21):
+    pass

pyasic/miners/antminer/bosminer/X21/__init__.py

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  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 .S21 import BOSMinerS21

pyasic/miners/antminer/bosminer/__init__.py

@@ -17,3 +17,4 @@
 from .X9 import *
 from .X17 import *
 from .X19 import *
+from .X21 import *

pyasic/miners/antminer/epic/X21/S21.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.backends import ePIC
+from pyasic.miners.models import S21
+
+
+class ePICS21(ePIC, S21):
+    pass

pyasic/miners/antminer/epic/X21/__init__.py

@@ -0,0 +1,19 @@
+# ------------------------------------------------------------------------------
+#  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 .S21 import (
+    ePICS21,
+)

pyasic/miners/antminer/epic/__init__.py

@@ -15,3 +15,4 @@
 # ------------------------------------------------------------------------------
 
 from .X19 import *
+from .X21 import *

pyasic/miners/antminer/luxos/X19/S19.py

@@ -0,0 +1,42 @@
+# ------------------------------------------------------------------------------
+#  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.backends import LUXMiner
+from pyasic.miners.models import S19, S19XP, S19jPro, S19jProPlus, S19kPro, S19Pro
+
+
+class LUXMinerS19(LUXMiner, S19):
+    pass
+
+
+class LUXMinerS19Pro(LUXMiner, S19Pro):
+    pass
+
+
+class LUXMinerS19jPro(LUXMiner, S19jPro):
+    pass
+
+
+class LUXMinerS19jProPlus(LUXMiner, S19jProPlus):
+    pass
+
+
+class LUXMinerS19kPro(LUXMiner, S19kPro):
+    pass
+
+
+class LUXMinerS19XP(LUXMiner, S19XP):
+    pass

pyasic/miners/antminer/luxos/X19/T19.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.backends import LUXMiner
+from pyasic.miners.models import T19
+
+
+class LUXMinerT19(LUXMiner, T19):
+    pass

pyasic/miners/antminer/luxos/X19/__init__.py

@@ -0,0 +1,25 @@
+# ------------------------------------------------------------------------------
+#  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 .S19 import (
+    LUXMinerS19,
+    LUXMinerS19jPro,
+    LUXMinerS19jProPlus,
+    LUXMinerS19kPro,
+    LUXMinerS19Pro,
+    LUXMinerS19XP,
+)
+from .T19 import LUXMinerT19

pyasic/miners/antminer/luxos/X21/S21.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.backends import LUXMiner
+from pyasic.miners.models import S21
+
+
+class LUXMinerS21(LUXMiner, S21):
+    pass

pyasic/miners/antminer/luxos/X21/__init__.py

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  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 .S21 import LUXMinerS21

pyasic/miners/antminer/luxos/__init__.py

@@ -15,3 +15,5 @@
 # ------------------------------------------------------------------------------
 
 from .X9 import *
+from .X19 import *
+from .X21 import *

pyasic/miners/antminer/vnish/X7/L7.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.backends import VNish
+from pyasic.miners.models import L7
+
+
+class VnishL7(VNish, L7):
+    pass

pyasic/miners/antminer/vnish/X7/__init__.py

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  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 .L7 import VnishL7

pyasic/miners/antminer/vnish/__init__.py

@@ -15,5 +15,6 @@
 # ------------------------------------------------------------------------------
 
 from .X3 import *
+from .X7 import *
 from .X17 import *
 from .X19 import *

pyasic/miners/backends/antminer.py

@@ -22,6 +22,7 @@ from pyasic.data.error_codes import MinerErrorData, X19Error
 from pyasic.errors import APIError
 from pyasic.miners.backends.bmminer import BMMiner
 from pyasic.miners.backends.cgminer import CGMiner
+from pyasic.miners.base import BaseMiner
 from pyasic.miners.data import (
     DataFunction,
     DataLocations,
@@ -29,6 +30,7 @@ from pyasic.miners.data import (
     RPCAPICommand,
     WebAPICommand,
 )
+from pyasic.rpc.antminer import AntminerRPCAPI
 from pyasic.ssh.antminer import AntminerModernSSH
 from pyasic.web.antminer import AntminerModernWebAPI, AntminerOldWebAPI
 
@@ -88,12 +90,16 @@ class AntminerModern(BMMiner):
     _web_cls = AntminerModernWebAPI
     web: AntminerModernWebAPI
 
+    _rpc_cls = AntminerRPCAPI
+    web: AntminerRPCAPI
+
     _ssh_cls = AntminerModernSSH
     ssh: AntminerModernSSH
 
     data_locations = ANTMINER_MODERN_DATA_LOC
 
     supports_shutdown = True
+    supports_power_modes = True
 
     async def get_config(self) -> MinerConfig:
         data = await self.web.get_miner_conf()
@@ -206,7 +212,7 @@ class AntminerModern(BMMiner):
         ]
 
         try:
-            rpc_stats = await self.rpc.send_command("stats", new_rpc=True)
+            rpc_stats = await self.rpc.stats(new_api=True)
         except APIError:
             return hashboards
 

pyasic/miners/backends/auradine.py

@@ -124,6 +124,7 @@ class Auradine(BaseMiner):
     data_locations = AURADINE_DATA_LOC
 
     supports_shutdown = True
+    supports_power_modes = True
     supports_autotuning = True
 
     async def fault_light_on(self) -> bool:

pyasic/miners/backends/bfgminer.py

@@ -68,7 +68,7 @@ class BFGMiner(BaseMiner):
         except APIError:
             return self.config
 
-        self.config = MinerConfig.from_rpc(pools)
+        self.config = MinerConfig.from_api(pools)
         return self.config
 
     ##################################################
@@ -84,11 +84,11 @@ class BFGMiner(BaseMiner):
 
         if rpc_version is not None:
             try:
-                self.rpc_ver = rpc_version["VERSION"][0]["API"]
+                self.api_ver = rpc_version["VERSION"][0]["API"]
             except LookupError:
                 pass
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
         if rpc_version is None:

pyasic/miners/backends/bmminer.py

@@ -72,7 +72,7 @@ class BMMiner(BaseMiner):
         except APIError:
             return self.config
 
-        self.config = MinerConfig.from_rpc(pools)
+        self.config = MinerConfig.from_api(pools)
         return self.config
 
     ##################################################
@@ -88,11 +88,11 @@ class BMMiner(BaseMiner):
 
         if rpc_version is not None:
             try:
-                self.rpc_ver = rpc_version["VERSION"][0]["API"]
+                self.api_ver = rpc_version["VERSION"][0]["API"]
             except LookupError:
                 pass
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
         if rpc_version is None:

pyasic/miners/backends/braiins_os.py

@@ -35,6 +35,7 @@ from pyasic.miners.data import (
 from pyasic.rpc.bosminer import BOSMinerRPCAPI
 from pyasic.ssh.braiins_os import BOSMinerSSH
 from pyasic.web.braiins_os import BOSerWebAPI, BOSMinerWebAPI
+from pyasic.web.braiins_os.proto.braiins.bos.v1 import SaveAction
 
 BOSMINER_DATA_LOC = DataLocations(
     **{
@@ -180,16 +181,17 @@ class BOSMiner(BaseMiner):
 
     async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
         self.config = config
+        parsed_cfg = config.as_bosminer(user_suffix=user_suffix)
 
         toml_conf = toml.dumps(
             {
                 "format": {
-                    "version": "1.2+",
+                    "version": "2.0",
                     "generator": "pyasic",
                     "model": f"{self.make.replace('Miner', 'miner')} {self.raw_model.replace('j', 'J')}",
                     "timestamp": int(time.time()),
                 },
-                **config.as_bosminer(user_suffix=user_suffix),
+                **parsed_cfg,
             }
         )
         try:
@@ -305,10 +307,10 @@ class BOSMiner(BaseMiner):
                 rpc_ver = rpc_version["VERSION"][0]["API"]
             except LookupError:
                 rpc_ver = None
-            self.rpc_ver = rpc_ver
+            self.api_ver = rpc_ver
-            self.rpc.rpc_ver = self.rpc_ver
+            self.rpc.rpc_ver = self.api_ver
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(self, web_bos_info: dict = None) -> Optional[str]:
         if web_bos_info is None:
@@ -691,7 +693,9 @@ class BOSer(BaseMiner):
 
     async def set_power_limit(self, wattage: int) -> bool:
         try:
-            result = await self.web.set_power_target(wattage)
+            result = await self.web.set_power_target(
+                wattage, save_action=SaveAction.SAVE_ACTION_SAVE_AND_FORCE_APPLY
+            )
         except APIError:
             return False
 
@@ -731,10 +735,10 @@ class BOSer(BaseMiner):
                 rpc_ver = rpc_version["VERSION"][0]["API"]
             except LookupError:
                 rpc_ver = None
-            self.rpc_ver = rpc_ver
+            self.api_ver = rpc_ver
-            self.rpc.rpc_ver = self.rpc_ver
+            self.rpc.rpc_ver = self.api_ver
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(self, grpc_miner_details: dict = None) -> Optional[str]:
         if grpc_miner_details is None:

pyasic/miners/backends/btminer.py

@@ -119,6 +119,7 @@ class BTMiner(BaseMiner):
     data_locations = BTMINER_DATA_LOC
 
     supports_shutdown = True
+    supports_power_modes = True
 
     async def _reset_rpc_pwd_to_admin(self, pwd: str):
         try:
@@ -234,7 +235,7 @@ class BTMiner(BaseMiner):
             pass
 
         if pools is not None:
-            cfg = MinerConfig.from_rpc(pools)
+            cfg = MinerConfig.from_api(pools)
         else:
             cfg = MinerConfig()
 
@@ -325,14 +326,14 @@ class BTMiner(BaseMiner):
                         rpc_ver = rpc_get_version["Msg"]
                         if not isinstance(rpc_ver, str):
                             rpc_ver = rpc_ver["rpc_ver"]
-                        self.rpc_ver = rpc_ver.replace("whatsminer v", "")
+                        self.api_ver = rpc_ver.replace("whatsminer v", "")
                     except (KeyError, TypeError):
                         pass
                     else:
-                        self.rpc.rpc_ver = self.rpc_ver
+                        self.rpc.rpc_ver = self.api_ver
-                        return self.rpc_ver
+                        return self.api_ver
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(
         self, rpc_get_version: dict = None, rpc_summary: dict = None

pyasic/miners/backends/cgminer.py

@@ -71,7 +71,7 @@ class CGMiner(BaseMiner):
         except APIError:
             return self.config
 
-        self.config = MinerConfig.from_rpc(pools)
+        self.config = MinerConfig.from_api(pools)
         return self.config
 
     ##################################################
@@ -87,11 +87,11 @@ class CGMiner(BaseMiner):
 
         if rpc_version is not None:
             try:
-                self.rpc_ver = rpc_version["VERSION"][0]["API"]
+                self.api_ver = rpc_version["VERSION"][0]["API"]
             except LookupError:
                 pass
 
-        return self.rpc_ver
+        return self.api_ver
 
     async def _get_fw_ver(self, rpc_version: dict = None) -> Optional[str]:
         if rpc_version is None:

pyasic/miners/backends/epic.py

@@ -51,7 +51,7 @@ EPIC_DATA_LOC = DataLocations(
             "_get_hashboards",
             [
                 WebAPICommand("web_summary", "summary"),
-                WebAPICommand("web_hashrate", "hashrate"),
+                WebAPICommand("web_capabilities", "capabilities"),
             ],
         ),
         str(DataOptions.WATTAGE): DataFunction(
@@ -284,7 +284,7 @@ class ePIC(BaseMiner):
         return fans
 
     async def _get_hashboards(
-        self, web_summary: dict = None, web_hashrate: dict = None
+        self, web_summary: dict = None, web_capabilities: dict = None
     ) -> List[HashBoard]:
         if web_summary is None:
             try:
@@ -292,28 +292,25 @@ class ePIC(BaseMiner):
             except APIError:
                 pass
 
-        if web_hashrate is not None:
+        if web_capabilities is not None:
             try:
-                web_hashrate = await self.web.hashrate()
+                web_capabilities = await self.web.capabilities()
             except APIError:
                 pass
+
         hb_list = [
             HashBoard(slot=i, expected_chips=self.expected_chips)
             for i in range(self.expected_hashboards)
         ]
-
         if web_summary.get("HBs") is not None:
             for hb in web_summary["HBs"]:
-                for hr in web_hashrate:
+                num_of_chips = web_capabilities["Performance Estimator"]["Chip Count"]
-                    if hr["Index"] == hb["Index"]:
+                hashrate = hb["Hashrate"][0]
-                        num_of_chips = len(hr["Data"])
+                # Update the Hashboard object
-                        hashrate = hb["Hashrate"][0]
+                hb_list[hb["Index"]].missing = False
-                        # Update the Hashboard object
+                hb_list[hb["Index"]].hashrate = round(hashrate / 1000000, 2)
-                        hb_list[hr["Index"]].expected_chips = num_of_chips
+                hb_list[hb["Index"]].chips = num_of_chips
-                        hb_list[hr["Index"]].missing = False
+                hb_list[hb["Index"]].temp = hb["Temperature"]
-                        hb_list[hr["Index"]].hashrate = round(hashrate / 1000000, 2)
-                        hb_list[hr["Index"]].chips = num_of_chips
-                        hb_list[hr["Index"]].temp = hb["Temperature"]
         return hb_list
 
     async def _is_mining(self, *args, **kwargs) -> Optional[bool]:

pyasic/miners/backends/goldshell.py

@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------
 from typing import List
 
-from pyasic.config import MinerConfig
+from pyasic.config import MinerConfig, MiningModeConfig
 from pyasic.data import HashBoard
 from pyasic.errors import APIError
 from pyasic.logger import logger
@@ -74,6 +74,9 @@ class GoldshellMiner(BFGMiner):
 
     data_locations = GOLDSHELL_DATA_LOC
 
+    supports_shutdown = True
+    supports_power_modes = True
+
     async def get_config(self) -> MinerConfig:
         # get pool data
         try:
@@ -96,13 +99,19 @@ class GoldshellMiner(BFGMiner):
             )
 
         self.config = config
-
+        cfg = config.as_goldshell(user_suffix=user_suffix)
         # send them back 1 at a time
-        for pool in config.as_goldshell(user_suffix=user_suffix)["pools"]:
+        for pool in cfg["pools"]:
             await self.web.newpool(
                 url=pool["url"], user=pool["user"], password=pool["pass"]
             )
 
+        settings = await self.web.setting()
+        for idx, plan in enumerate(settings["powerplans"]):
+            if plan["level"] == cfg["settings"]["level"]:
+                settings["select"] = idx
+        await self.web.set_setting(settings)
+
     async def _get_mac(self, web_setting: dict = None) -> str:
         if web_setting is None:
             try:
@@ -178,3 +187,25 @@ class GoldshellMiner(BFGMiner):
                 logger.error(self, rpc_devdetails)
 
         return hashboards
+
+    async def stop_mining(self) -> bool:
+        settings = await self.web.setting()
+        mode = MiningModeConfig.sleep()
+        cfg = mode.as_goldshell()
+        level = cfg["settings"]["level"]
+        for idx, plan in enumerate(settings["powerplans"]):
+            if plan["level"] == level:
+                settings["select"] = idx
+        await self.web.set_setting(settings)
+        return True
+
+    async def resume_mining(self) -> bool:
+        settings = await self.web.setting()
+        mode = MiningModeConfig.normal()
+        cfg = mode.as_goldshell()
+        level = cfg["settings"]["level"]
+        for idx, plan in enumerate(settings["powerplans"]):
+            if plan["level"] == level:
+                settings["select"] = idx
+        await self.web.set_setting(settings)
+        return True

pyasic/miners/backends/vnish.py

@@ -74,6 +74,10 @@ VNISH_DATA_LOC = DataLocations(
             "_get_uptime",
             [RPCAPICommand("rpc_stats", "stats")],
         ),
+        str(DataOptions.IS_MINING): DataFunction(
+            "_is_mining",
+            [WebAPICommand("web_summary", "summary")],
+        ),
     }
 )
 
@@ -84,6 +88,8 @@ class VNish(BMMiner):
     _web_cls = VNishWebAPI
     web: VNishWebAPI
 
+    supports_shutdown = True
+
     firmware = "VNish"
 
     data_locations = VNISH_DATA_LOC
@@ -125,16 +131,6 @@ class VNish(BMMiner):
         return False
 
     async def _get_mac(self, web_summary: dict = None) -> str:
-        if web_summary is None:
-            web_info = await self.web.info()
-
-            if web_info is not None:
-                try:
-                    mac = web_info["system"]["network_status"]["mac"]
-                    return mac
-                except KeyError:
-                    pass
-
         if web_summary is not None:
             try:
                 mac = web_summary["system"]["network_status"]["mac"]
@@ -142,6 +138,15 @@ class VNish(BMMiner):
             except KeyError:
                 pass
 
+        web_info = await self.web.info()
+
+        if web_info is not None:
+            try:
+                mac = web_info["system"]["network_status"]["mac"]
+                return mac
+            except KeyError:
+                pass
+
     async def _get_hostname(self, web_summary: dict = None) -> str:
         if web_summary is None:
             web_info = await self.web.info()
@@ -205,12 +210,27 @@ class VNish(BMMiner):
         if web_summary is None:
             web_summary = await self.web.summary()
 
+        fw_ver = None
         if web_summary is not None:
             try:
                 fw_ver = web_summary["miner"]["miner_type"]
                 fw_ver = fw_ver.split("(Vnish ")[1].replace(")", "")
                 return fw_ver
-            except KeyError:
+            except LookupError:
+                return fw_ver
+
+    async def _is_mining(self, web_summary: dict = None) -> Optional[bool]:
+        if web_summary is None:
+            web_summary = await self.web.summary()
+
+        if web_summary is not None:
+            try:
+                is_mining = not web_summary["miner"]["miner_status"]["miner_state"] in [
+                    "stopped",
+                    "shutting-down",
+                ]
+                return is_mining
+            except LookupError:
                 pass
 
     async def get_config(self) -> MinerConfig:

pyasic/miners/base.py

@@ -47,6 +47,7 @@ class MinerProtocol(Protocol):
     data_locations: DataLocations = None
 
     supports_shutdown: bool = False
+    supports_power_modes: bool = False
     supports_autotuning: bool = False
 
     api_ver: str = None
@@ -68,7 +69,12 @@ class MinerProtocol(Protocol):
 
     @property
     def model(self) -> str:
-        model_data = [self.raw_model if self.raw_model is not None else "Unknown"]
+        if self.raw_model is not None:
+            model_data = [self.raw_model]
+        elif self.make is not None:
+            model_data = [self.make]
+        else:
+            model_data = ["Unknown"]
         if self.firmware is not None:
             model_data.append(f"({self.firmware})")
         return " ".join(model_data)
@@ -461,9 +467,11 @@ class MinerProtocol(Protocol):
             ip=str(self.ip),
             make=self.make,
             model=self.model,
-            expected_chips=self.expected_chips * self.expected_hashboards
+            expected_chips=(
-            if self.expected_chips is not None
+                self.expected_chips * self.expected_hashboards
-            else 0,
+                if self.expected_chips is not None
+                else 0
+            ),
             expected_hashboards=self.expected_hashboards,
             hashboards=[
                 HashBoard(slot=i, expected_chips=self.expected_chips)

pyasic/miners/blockminer/__init__.py

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  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 .epic import *

pyasic/miners/blockminer/epic/__init__.py

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  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 .blockminer import *

pyasic/miners/blockminer/epic/blockminer/__init__.py

@@ -0,0 +1,19 @@
+# ------------------------------------------------------------------------------
+#  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 .blockminer import (
+    ePICBlockMiner520i,
+)

pyasic/miners/blockminer/epic/blockminer/blockminer.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.backends import ePIC
+from pyasic.miners.models import BlockMiner520i
+
+
+class ePICBlockMiner520i(ePIC, BlockMiner520i):
+    pass

pyasic/miners/factory.py

@@ -45,8 +45,10 @@ from pyasic.miners.backends import (
 )
 from pyasic.miners.backends.unknown import UnknownMiner
 from pyasic.miners.base import AnyMiner
+from pyasic.miners.blockminer import *
 from pyasic.miners.goldshell import *
 from pyasic.miners.innosilicon import *
+from pyasic.miners.makes import *
 from pyasic.miners.whatsminer import *
 
 
@@ -66,7 +68,7 @@ class MinerTypes(enum.Enum):
 
 MINER_CLASSES = {
     MinerTypes.ANTMINER: {
-        None: BMMiner,
+        None: type("AntminerUnknown", (BMMiner, AntMinerMake), {}),
         "ANTMINER D3": CGMinerD3,
         "ANTMINER HS3": BMMinerHS3,
         "ANTMINER L3+": BMMinerL3Plus,
@@ -97,11 +99,15 @@ MINER_CLASSES = {
         "ANTMINER S19 XP": BMMinerS19XP,
         "ANTMINER S19A": BMMinerS19a,
         "ANTMINER S19A PRO": BMMinerS19aPro,
+        "ANTMINER S19 HYDRO": BMMinerS19Hydro,
         "ANTMINER S19 PRO HYD.": BMMinerS19ProHydro,
+        "ANTMINER S19 PRO+ HYD.": BMMinerS19ProPlusHydro,
+        "ANTMINER S19K PRO": BMMinerS19KPro,
         "ANTMINER T19": BMMinerT19,
+        "ANTMINER S21": BMMinerS21,
     },
     MinerTypes.WHATSMINER: {
-        None: BTMiner,
+        None: type("WhatsminerUnknown", (BTMiner, WhatsMinerMake), {}),
         "M20V10": BTMinerM20V10,
         "M20SV10": BTMinerM20SV10,
         "M20SV20": BTMinerM20SV20,
@@ -289,7 +295,9 @@ MINER_CLASSES = {
         "M50S++VK30": BTMinerM50SPlusPlusVK30,
         "M53VH30": BTMinerM53VH30,
         "M53SVH30": BTMinerM53SVH30,
+        "M53SVJ40": BTMinerM53SVJ40,
         "M53S+VJ30": BTMinerM53SPlusVJ30,
+        "M53S++VK10": BTMinerM53SPlusPlusVK10,
         "M56VH30": BTMinerM56VH30,
         "M56SVH30": BTMinerM56SVH30,
         "M56S+VJ30": BTMinerM56SPlusVJ30,
@@ -315,7 +323,7 @@ MINER_CLASSES = {
         "M66SVK40": BTMinerM66SVK40,
     },
     MinerTypes.AVALONMINER: {
-        None: AvalonMiner,
+        None: type("AvalonUnknown", (AvalonMiner, AvalonMinerMake), {}),
         "AVALONMINER 721": CGMinerAvalon721,
         "AVALONMINER 741": CGMinerAvalon741,
         "AVALONMINER 761": CGMinerAvalon761,
@@ -330,16 +338,18 @@ MINER_CLASSES = {
         "AVALONMINER 1246": CGMinerAvalon1246,
     },
     MinerTypes.INNOSILICON: {
-        None: Innosilicon,
+        None: type("InnosiliconUnknown", (Innosilicon, InnosiliconMake), {}),
         "T3H+": InnosiliconT3HPlus,
         "A10X": InnosiliconA10X,
     },
     MinerTypes.GOLDSHELL: {
-        None: GoldshellMiner,
+        None: type("GoldshellUnknown", (GoldshellMiner, GoldshellMake), {}),
         "GOLDSHELL CK5": GoldshellCK5,
         "GOLDSHELL HS5": GoldshellHS5,
         "GOLDSHELL KD5": GoldshellKD5,
         "GOLDSHELL KDMAX": GoldshellKDMax,
+        "GOLDSHELL KDBOXII": GoldshellKDBoxII,
+        "GOLDSHELL KDBOXPRO": GoldshellKDBoxPro,
     },
     MinerTypes.BRAIINS_OS: {
         None: BOSMiner,
@@ -362,12 +372,15 @@ MINER_CLASSES = {
         "ANTMINER S19J PRO NOPIC": BOSMinerS19jPro,
         "ANTMINER S19J PRO+": BOSMinerS19jProPlus,
         "ANTMINER S19K PRO NOPIC": BOSMinerS19kProNoPIC,
-        "ANTMINER S19XP": BOSMinerS19XP,
+        "ANTMINER S19 XP": BOSMinerS19XP,
         "ANTMINER T19": BOSMinerT19,
+        "ANTMINER S21": BOSMinerS21,
     },
     MinerTypes.VNISH: {
         None: VNish,
+        "L3+": VnishL3Plus,
         "ANTMINER L3+": VnishL3Plus,
+        "ANTMINER L7": VnishL7,
         "ANTMINER S17+": VNishS17Plus,
         "ANTMINER S17 PRO": VNishS17Pro,
         "ANTMINER S19": VNishS19,
@@ -388,6 +401,8 @@ MINER_CLASSES = {
         "ANTMINER S19J PRO+": ePICS19jProPlus,
         "ANTMINER S19K PRO": ePICS19kPro,
         "ANTMINER S19 XP": ePICS19XP,
+        "ANTMINER S21": ePICS21,
+        "BLOCKMINER 520I": ePICBlockMiner520i,
     },
     MinerTypes.HIVEON: {
         None: Hiveon,
@@ -396,9 +411,17 @@ MINER_CLASSES = {
     MinerTypes.LUX_OS: {
         None: LUXMiner,
         "ANTMINER S9": LUXMinerS9,
+        "ANTMINER S19": LUXMinerS19,
+        "ANTMINER S19 PRO": LUXMinerS19Pro,
+        "ANTMINER S19J PRO": LUXMinerS19jPro,
+        "ANTMINER S19J PRO+": LUXMinerS19jProPlus,
+        "ANTMINER S19K PRO": LUXMinerS19kPro,
+        "ANTMINER S19 XP": LUXMinerS19XP,
+        "ANTMINER T19": LUXMinerT19,
+        "ANTMINER S21": LUXMinerS21,
     },
     MinerTypes.AURADINE: {
-        None: Auradine,
+        None: type("GoldshellUnknown", (Auradine, AuradineMake), {}),
         "AT1500": AuradineFluxAT1500,
         "AT2860": AuradineFluxAT2860,
         "AT2880": AuradineFluxAT2880,
@@ -494,7 +517,6 @@ class MinerFactory:
                     )
                 except asyncio.TimeoutError:
                     pass
-
             miner = self._select_miner_from_classes(
                 ip,
                 miner_type=miner_type,
@@ -666,7 +688,11 @@ class MinerFactory:
             return MinerTypes.LUX_OS
         if "ANTMINER" in upper_data and "DEVDETAILS" not in upper_data:
             return MinerTypes.ANTMINER
-        if "INTCHAINS_QOMO" in upper_data:
+        if (
+            "INTCHAINS_QOMO" in upper_data
+            or "KDAMINER" in upper_data
+            or "BFGMINER" in upper_data
+        ):
             return MinerTypes.GOLDSHELL
         if "AVALON" in upper_data:
             return MinerTypes.AVALONMINER
@@ -890,10 +916,11 @@ class MinerFactory:
     async def get_miner_model_braiins_os(self, ip: str) -> str | None:
         sock_json_data = await self.send_api_command(ip, "devdetails")
         try:
-            miner_model = sock_json_data["DEVDETAILS"][0]["Model"].replace(
+            miner_model = (
-                "Bitmain ", ""
+                sock_json_data["DEVDETAILS"][0]["Model"]
+                .replace("Bitmain ", "")
+                .replace("S19XP", "S19 XP")
             )
-
             return miner_model
         except (TypeError, LookupError):
             pass
@@ -906,7 +933,9 @@ class MinerFactory:
                 )
             if d.status_code == 200:
                 json_data = d.json()
-                miner_model = json_data["data"]["bosminer"]["info"]["modelName"]
+                miner_model = json_data["data"]["bosminer"]["info"][
+                    "modelName"
+                ].replace("S19XP", "S19 XP")
                 return miner_model
         except (httpx.HTTPError, LookupError):
             pass
@@ -930,12 +959,16 @@ class MinerFactory:
             pass
 
     async def get_miner_model_epic(self, ip: str) -> str | None:
-        sock_json_data = await self.send_web_command(ip, ":4028/capabilities")
+        for retry_cnt in range(settings.get("get_data_retries", 1)):
-        try:
+            sock_json_data = await self.send_web_command(ip, ":4028/capabilities")
-            miner_model = sock_json_data["Model"]
+            try:
-            return miner_model
+                miner_model = sock_json_data["Model"]
-        except (TypeError, LookupError):
+                return miner_model
-            pass
+            except (TypeError, LookupError):
+                if retry_cnt < settings.get("get_data_retries", 1) - 1:
+                    continue
+                else:
+                    pass
 
     async def get_miner_model_hiveon(self, ip: str) -> str | None:
         sock_json_data = await self.send_api_command(ip, "version")
@@ -968,6 +1001,7 @@ class MinerFactory:
 
 miner_factory = MinerFactory()
 
+
 # abstracted version of get miner that is easier to access
 async def get_miner(ip: ipaddress.ip_address | str) -> AnyMiner:
     return await miner_factory.get_miner(ip)

pyasic/miners/goldshell/bfgminer/XBox/KDBox.py

@@ -0,0 +1,25 @@
+# ------------------------------------------------------------------------------
+#  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.backends import GoldshellMiner
+from pyasic.miners.models import KDBoxII, KDBoxPro
+
+
+class GoldshellKDBoxII(GoldshellMiner, KDBoxII):
+    pass
+
+
+class GoldshellKDBoxPro(GoldshellMiner, KDBoxPro):
+    pass

pyasic/miners/goldshell/bfgminer/XBox/__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 .KDBox import GoldshellKDBoxII, GoldshellKDBoxPro

pyasic/miners/goldshell/bfgminer/__init__.py

@@ -14,4 +14,5 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from .X5 import *
+from .XBox import *
 from .XMax import *

pyasic/miners/makes/__init__.py

@@ -39,3 +39,7 @@ class GoldshellMake(BaseMiner):
 
 class AuradineMake(BaseMiner):
     make = "Auradine"
+
+
+class ePICMake(BaseMiner):
+    make = "ePIC"

pyasic/miners/models/__init__.py

@@ -20,3 +20,4 @@ from .avalonminer import *
 from .goldshell import *
 from .innosilicon import *
 from .whatsminer import *
+from .epic import *

pyasic/miners/models/antminer/X19/S19.py

@@ -113,8 +113,28 @@ class S19kProNoPIC(AntMinerMake):
     expected_fans = 4
 
 
+class S19Hydro(AntMinerMake):
+    raw_model = "S19 Hydro"
+    expected_chips = 104
+    expected_hashboards = 4
+    expected_fans = 0
+
+
 class S19ProHydro(AntMinerMake):
     raw_model = "S19 Pro Hydro"
     expected_chips = 180
     expected_hashboards = 4
     expected_fans = 0
+
+
+class S19ProPlusHydro(AntMinerMake):
+    raw_model = "S19 Pro+ Hydro"
+    expected_chips = 180
+    expected_hashboards = 4
+    expected_fans = 0
+
+
+class S19KPro(AntMinerMake):
+    raw_model = "S19K Pro"
+    expected_chips = 77
+    expected_fans = 4

pyasic/miners/models/antminer/X19/__init__.py

@@ -20,6 +20,7 @@ from .S19 import (
     S19XP,
     S19a,
     S19aPro,
+    S19Hydro,
     S19i,
     S19j,
     S19jNoPIC,
@@ -32,5 +33,7 @@ from .S19 import (
     S19Pro,
     S19ProHydro,
     S19ProPlus,
+    S19ProPlusHydro,
+    S19KPro,
 )
 from .T19 import T19

pyasic/miners/models/antminer/X21/S21.py

@@ -0,0 +1,23 @@
+# ------------------------------------------------------------------------------
+#  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 AntMinerMake
+
+
+class S21(AntMinerMake):
+    raw_model = "S21"
+    expected_chips = 108
+    expected_fans = 4

pyasic/miners/models/antminer/X21/__init__.py

@@ -0,0 +1,19 @@
+# ------------------------------------------------------------------------------
+#  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 .S21 import (
+    S21,
+)

pyasic/miners/models/antminer/__init__.py

@@ -20,3 +20,4 @@ from .X9 import *
 from .X15 import *
 from .X17 import *
 from .X19 import *
+from .X21 import *

pyasic/miners/models/epic/__init__.py

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

pyasic/miners/models/epic/blockminer/__init__.py

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

pyasic/miners/models/epic/blockminer/blockminer.py

@@ -0,0 +1,7 @@
+from pyasic.miners.makes import ePICMake
+
+
+class BlockMiner520i(ePICMake):
+    raw_model = "BlockMiner 520i"
+    expected_chips = 124
+    expected_fans = 4

pyasic/miners/models/goldshell/XBox/KDBox.py

@@ -0,0 +1,30 @@
+# ------------------------------------------------------------------------------
+#  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 GoldshellMake
+
+
+class KDBoxII(GoldshellMake):
+    raw_model = "KD Box II"
+    expected_chips = 36
+    expected_fans = 2
+    expected_hashboards = 1
+
+
+class KDBoxPro(GoldshellMake):
+    raw_model = "KD Box Pro"
+    expected_chips = 16
+    expected_fans = 2
+    expected_hashboards = 1

pyasic/miners/models/goldshell/XBox/__init__.py

@@ -0,0 +1 @@
+from .KDBox import KDBoxII, KDBoxPro

pyasic/miners/models/goldshell/__init__.py

@@ -14,4 +14,5 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from .X5 import *
+from .XBox import *
 from .XMax import *

pyasic/miners/models/whatsminer/M5X/M53S.py

@@ -20,3 +20,8 @@ from pyasic.miners.makes import WhatsMinerMake
 class M53SVH30(WhatsMinerMake):
     raw_model = "M53S VH30"
     expected_fans = 0
+
+
+class M53SVJ40(WhatsMinerMake):
+    raw_model = "M53S VJ40"
+    expected_fans = 0

pyasic/miners/models/whatsminer/M5X/M53S_Plus_Plus.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.makes import WhatsMinerMake
+
+
+class M53SPlusPlusVK10(WhatsMinerMake):
+    raw_model = "M53S++ VK10"
+    expected_fans = 0

pyasic/miners/models/whatsminer/M5X/__init__.py

@@ -42,8 +42,9 @@ from .M50S import (
 from .M50S_Plus import M50SPlusVH30, M50SPlusVH40, M50SPlusVJ30, M50SPlusVK20
 from .M50S_Plus_Plus import M50SPlusPlusVK10, M50SPlusPlusVK20, M50SPlusPlusVK30
 from .M53 import M53VH30
-from .M53S import M53SVH30
+from .M53S import M53SVH30, M53SVJ40
 from .M53S_Plus import M53SPlusVJ30
+from .M53S_Plus_Plus import M53SPlusPlusVK10
 from .M56 import M56VH30
 from .M56S import M56SVH30
 from .M56S_Plus import M56SPlusVJ30

pyasic/miners/whatsminer/btminer/M5X/M53S.py

@@ -15,8 +15,12 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import M5X
-from pyasic.miners.models import M53SVH30
+from pyasic.miners.models import M53SVH30, M53SVJ40
 
 
 class BTMinerM53SVH30(M5X, M53SVH30):
     pass
+
+
+class BTMinerM53SVJ40(M5X, M53SVJ40):
+    pass

pyasic/miners/whatsminer/btminer/M5X/M53S_Plus_Plus.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.backends import M5X
+from pyasic.miners.models import M53SPlusPlusVK10
+
+
+class BTMinerM53SPlusPlusVK10(M5X, M53SPlusPlusVK10):
+    pass

pyasic/miners/whatsminer/btminer/M5X/__init__.py

@@ -51,8 +51,9 @@ from .M50S_Plus_Plus import (
     BTMinerM50SPlusPlusVK30,
 )
 from .M53 import BTMinerM53VH30
-from .M53S import BTMinerM53SVH30
+from .M53S import BTMinerM53SVH30, BTMinerM53SVJ40
 from .M53S_Plus import BTMinerM53SPlusVJ30
+from .M53S_Plus_Plus import BTMinerM53SPlusPlusVK10
 from .M56 import BTMinerM56VH30
 from .M56S import BTMinerM56SVH30
 from .M56S_Plus import BTMinerM56SPlusVJ30

pyasic/misc/__init__.py

@@ -107,3 +107,4 @@ def validate_command_output(data: dict) -> tuple[bool, str | None]:
                 if data[key][0]["STATUS"][0]["STATUS"] not in ["S", "I"]:
                     # this is an error
                     return False, f"{key}: " + data[key][0]["STATUS"][0]["Msg"]
+        return True, None

pyasic/rpc/antminer.py

@@ -0,0 +1,36 @@
+from pyasic.rpc.bmminer import BMMinerRPCAPI
+
+
+class AntminerRPCAPI(BMMinerRPCAPI):
+    async def stats(self, new_api: bool = False) -> dict:
+        if new_api:
+            return await self.send_command("stats", new_api=True)
+        return await super().stats()
+
+    async def rate(self):
+        return await self.send_command("rate", new_api=True)
+
+    async def pools(self, new_api: bool = False):
+        if new_api:
+            return await self.send_command("pools", new_api=True)
+        return await self.send_command("pools")
+
+    async def reload(self):
+        return await self.send_command("reload", new_api=True)
+
+    async def summary(self, new_api: bool = False):
+        if new_api:
+            return await self.send_command("summary", new_api=True)
+        return await self.send_command("summary")
+
+    async def warning(self):
+        return await self.send_command("warning", new_api=True)
+
+    async def new_api_pools(self):
+        return await self.pools(new_api=True)
+
+    async def new_api_stats(self):
+        return await self.stats(new_api=True)
+
+    async def new_api_summary(self):
+        return await self.summary(new_api=True)

pyasic/rpc/base.py

@@ -78,6 +78,9 @@ class BaseMinerRPCAPI:
         # send the command
         data = await self._send_bytes(json.dumps(cmd).encode("utf-8"))
 
+        if data is None:
+            raise APIError("No data returned from the API.")
+
         if data == b"Socket connect failed: Connection refused\n":
             if not ignore_errors:
                 raise APIError(data.decode("utf-8"))
@@ -90,7 +93,7 @@ class BaseMinerRPCAPI:
         if not validation[0]:
             if not ignore_errors:
                 # validate the command succeeded
-                raise APIError(validation[1])
+                raise APIError(f"{command}: {validation[1]}")
             if allow_warning:
                 logging.warning(
                     f"{self.ip}: API Command Error: {command}: {validation[1]}"
@@ -162,7 +165,7 @@ class BaseMinerRPCAPI:
             for func in
             # each function in self
             dir(self)
-            if not func == "commands"
+            if not func in ["commands", "open_api"]
             if callable(getattr(self, func)) and
             # no __ or _ methods
             not func.startswith("__") and not func.startswith("_") and
@@ -193,12 +196,16 @@ If you are sure you want to use this command please use API.send_command("{comma
     async def _send_bytes(
         self,
         data: bytes,
+        *,
+        port: int = None,
         timeout: int = 100,
     ) -> bytes:
+        if port is None:
+            port = self.port
         logging.debug(f"{self} - ([Hidden] Send Bytes) - Sending")
         try:
             # get reader and writer streams
-            reader, writer = await asyncio.open_connection(str(self.ip), self.port)
+            reader, writer = await asyncio.open_connection(str(self.ip), port)
         # handle OSError 121
         except OSError as e:
             if e.errno == 121:
@@ -208,39 +215,14 @@ If you are sure you want to use this command please use API.send_command("{comma
             return b"{}"
 
         # send the command
+        data_task = asyncio.create_task(self._read_bytes(reader, timeout=timeout))
         logging.debug(f"{self} - ([Hidden] Send Bytes) - Writing")
         writer.write(data)
         logging.debug(f"{self} - ([Hidden] Send Bytes) - Draining")
         await writer.drain()
-        try:
-            # TO address a situation where a whatsminer has an unknown PW -AND-
-            # Fix for stupid whatsminer bug, reboot/restart seem to not load properly in the loop
-            # have to receive, save the data, check if there is more data by reading with a short timeout
-            # append that data if there is more, and then onto the main loop.
-            # the password timeout might need to be longer than 1, but it seems to work for now.
-            ret_data = await asyncio.wait_for(reader.read(1), timeout=1)
-        except asyncio.TimeoutError:
-            return b"{}"
-        try:
-            ret_data += await asyncio.wait_for(reader.read(4096), timeout=timeout)
-        except ConnectionAbortedError:
-            return b"{}"
 
-        # loop to receive all the data
+        await data_task
-        logging.debug(f"{self} - ([Hidden] Send Bytes) - Receiving")
+        ret_data = data_task.result()
-        try:
-            while True:
-                try:
-                    d = await asyncio.wait_for(reader.read(4096), timeout=timeout)
-                    if not d:
-                        break
-                    ret_data += d
-                except (asyncio.CancelledError, asyncio.TimeoutError) as e:
-                    raise e
-        except (asyncio.CancelledError, asyncio.TimeoutError) as e:
-            raise e
-        except Exception as e:
-            logging.warning(f"{self} - ([Hidden] Send Bytes) - API Command Error {e}")
 
         # close the connection
         logging.debug(f"{self} - ([Hidden] Send Bytes) - Closing")
@@ -249,6 +231,19 @@ If you are sure you want to use this command please use API.send_command("{comma
 
         return ret_data
 
+    async def _read_bytes(self, reader: asyncio.StreamReader, timeout: int) -> bytes:
+        ret_data = b""
+
+        # loop to receive all the data
+        logging.debug(f"{self} - ([Hidden] Send Bytes) - Receiving")
+        try:
+            ret_data = await asyncio.wait_for(reader.read(), timeout=timeout)
+        except (asyncio.CancelledError, asyncio.TimeoutError) as e:
+            raise e
+        except Exception as e:
+            logging.warning(f"{self} - ([Hidden] Send Bytes) - API Command Error {e}")
+        return ret_data
+
     @staticmethod
     def _load_api_data(data: bytes) -> dict:
         # some json from the API returns with a null byte (\x00) on the end

pyasic/rpc/btminer.py

@@ -24,12 +24,13 @@ import logging
 import re
 from typing import Literal, Union
 
+import httpx
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from passlib.handlers.md5_crypt import md5_crypt
 
 from pyasic import settings
 from pyasic.errors import APIError
-from pyasic.misc import api_min_version
+from pyasic.misc import api_min_version, validate_command_output
 from pyasic.rpc.base import BaseMinerRPCAPI
 
 ### IMPORTANT ###
@@ -240,6 +241,28 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):
         ignore_errors: bool = False,
         timeout: int = 10,
         **kwargs,
+    ) -> dict:
+        try:
+            return await self._send_privileged_command(
+                command=command, ignore_errors=ignore_errors, timeout=timeout, **kwargs
+            )
+        except APIError as e:
+            if not e.message == "can't access write cmd":
+                raise
+        try:
+            await self.open_api()
+        except Exception as e:
+            raise APIError("Failed to open whatsminer API.") from e
+        return await self._send_privileged_command(
+            command=command, ignore_errors=ignore_errors, timeout=timeout, **kwargs
+        )
+
+    async def _send_privileged_command(
+        self,
+        command: Union[str, bytes],
+        ignore_errors: bool = False,
+        timeout: int = 10,
+        **kwargs,
     ) -> dict:
         logging.debug(
             f"{self} - (Send Privileged Command) - {command} " + f"with args {kwargs}"
@@ -253,7 +276,7 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):
 
         logging.debug(f"{self} - (Send Privileged Command) - Sending")
         try:
-            data = await self._send_bytes(enc_command, timeout)
+            data = await self._send_bytes(enc_command, timeout=timeout)
         except (asyncio.CancelledError, asyncio.TimeoutError):
             if ignore_errors:
                 return {}
@@ -272,7 +295,7 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):
 
         if not ignore_errors:
             # if it fails to validate, it is likely an error
-            validation = self._validate_command_output(data)
+            validation = validate_command_output(data)
             if not validation[0]:
                 raise APIError(validation[1])
 
@@ -321,6 +344,36 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):
         logging.debug(f"{self} - (Get Token) - Gathered token data: {self.token}")
         return self.token
 
+    async def open_api(self):
+        async with httpx.AsyncClient() as c:
+            stage1_req = (
+                await c.post(
+                    "https://wmt.pyasic.org/v1/stage1",
+                    json={"ip": str(self.ip)},
+                    follow_redirects=True,
+                )
+            ).json()
+            stage1_res = binascii.hexlify(
+                await self._send_bytes(binascii.unhexlify(stage1_req), port=8889)
+            )
+            stage2_req = (
+                await c.post(
+                    "https://wmt.pyasic.org/v1/stage2",
+                    json={
+                        "ip": str(self.ip),
+                        "stage1_result": stage1_res.decode("utf-8"),
+                    },
+                )
+            ).json()
+        for command in stage2_req:
+            try:
+                await self._send_bytes(
+                    binascii.unhexlify(command), timeout=3, port=8889
+                )
+            except asyncio.TimeoutError:
+                pass
+        return True
+
     #### PRIVILEGED COMMANDS ####
     # Please read the top of this file to learn
     # how to configure the Whatsminer API to
@@ -607,10 +660,10 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):
             A reply informing of the status of setting the frequency.
         </details>
         """
-        if not -10 < percent < 100:
+        if not -100 < percent < 100:
             raise APIError(
                 f"Frequency % is outside of the allowed "
-                f"range.  Please set a % between -10 and "
+                f"range.  Please set a % between -100 and "
                 f"100"
             )
         return await self.send_privileged_command(

pyasic/settings/__init__.py

@@ -28,6 +28,7 @@ _settings = {  # defaults
     "factory_get_timeout": 3,
     "get_data_retries": 1,
     "api_function_timeout": 5,
+    "antminer_mining_mode_as_str": False,
     "default_whatsminer_rpc_password": "admin",
     "default_innosilicon_web_password": "admin",
     "default_antminer_web_password": "root",
@@ -45,7 +46,9 @@ _settings = {  # defaults
 
 ssl_cxt = httpx.create_ssl_context()
 
-
+#this function configures socket options like SO_LINGER and returns an AsyncHTTPTransport instance to perform asynchronous HTTP requests 
+#using those options.
+#SO_LINGER controls what happens when you close a socket with unsent data - it allows specifying linger time for the data to be sent. 
 def transport(verify: Union[str, bool, SSLContext] = ssl_cxt):
     l_onoff = 1
     l_linger = get("so_linger_time", 1000)

pyasic/web/braiins_os/boser.py

@@ -70,13 +70,15 @@ class BOSerWebAPI(BaseWebAPI):
             not func.startswith("__") and not func.startswith("_")
         ]
 
-    async def multicommand(self, *commands: str) -> dict:
+    async def multicommand(
+        self, *commands: str, ignore_errors: bool = False, allow_warning: bool = True
+    ) -> dict:
         result = {"multicommand": True}
         tasks = {}
         for command in commands:
             try:
                 tasks[command] = asyncio.create_task(getattr(self, command)())
-            except AttributeError:
+            except (APIError, AttributeError):
                 result["command"] = {}
 
         await asyncio.gather(*list(tasks.values()))

pyasic/web/braiins_os/bosminer.py

@@ -59,17 +59,23 @@ class BOSMinerWebAPI(BaseWebAPI):
                 return {}
             raise APIError(f"LUCI web command failed: command={command}")
 
-    async def multicommand(self, *commands: str) -> dict:
+    async def multicommand(
+        self, *commands: str, ignore_errors: bool = False, allow_warning: bool = True
+    ) -> dict:
         data = {}
         for command in commands:
-            data[command] = await self.send_command(command, ignore_errors=True)
+            data[command] = await self.send_command(
+                command, ignore_errors=ignore_errors
+            )
         return data
 
     async def auth(self, session: httpx.AsyncClient) -> None:
         login = {"luci_username": self.username, "luci_password": self.pwd}
         url = f"http://{self.ip}:{self.port}/cgi-bin/luci"
         headers = {
-            "User-Agent": "BTC Tools v0.1",  # only seems to respond if this user-agent is set
+            "User-Agent": (
+                "BTC Tools v0.1"
+            ),  # only seems to respond if this user-agent is set
             "Content-Type": "application/x-www-form-urlencoded",
         }
         await session.post(url, headers=headers, data=login)

pyasic/web/epic.py

@@ -44,7 +44,7 @@ class ePICWebAPI(BaseWebAPI):
         post = privileged or not parameters == {}
 
         async with httpx.AsyncClient(transport=settings.transport()) as client:
-            for i in range(settings.get("get_data_retries", 1) + 1):
+            for retry_cnt in range(settings.get("get_data_retries", 1)):
                 try:
                     if post:
                         response = await client.post(
@@ -61,16 +61,16 @@ class ePICWebAPI(BaseWebAPI):
                             timeout=5,
                         )
                     if not response.status_code == 200:
-                        continue
+                        if not ignore_errors:
+                            raise APIError(
+                                f"Web command {command} failed with status code {response.status_code}"
+                            )
+                        return {}
                     json_data = response.json()
                     if json_data:
                         # The API can return a fail status if the miner cannot return the requested data. Catch this and pass
-                        if (
+                        if not json_data.get("result", True) and not post:
-                            "result" in json_data
+                            if retry_cnt < settings.get("get_data_retries", 1) - 1:
-                            and json_data["result"] is False
-                            and not post
-                        ):
-                            if not i > settings.get("get_data_retries", 1):
                                 continue
                             if not ignore_errors:
                                 raise APIError(json_data["error"])

pyasic/web/goldshell.py

@@ -138,5 +138,8 @@ class GoldshellWebAPI(BaseWebAPI):
     async def setting(self) -> dict:
         return await self.send_command("setting")
 
+    async def set_setting(self, values: dict):
+        await self.send_command("setting", **values)
+
     async def status(self) -> dict:
         return await self.send_command("status")

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyasic"
-version = "0.50.2"
+version = "0.54.14"
 description = "A simplified and standardized interface for Bitcoin ASICs."
 authors = ["UpstreamData <brett@upstreamdata.ca>"]
 repository = "https://github.com/UpstreamData/pyasic"
@@ -9,7 +9,7 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.8"
-httpx = "^0.26.0"
+httpx = ">=0.26.0"
 asyncssh = "^2.14.2"
 passlib = "^1.7.4"
 pyaml = "^23.12.0"

tests/__init__.py

@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from tests.api_tests import *
+from tests.rpc_tests import *
 from tests.config_tests import TestConfig
 from tests.miners_tests import MinersTest
 from tests.network_tests import NetworkTest

tests/config_tests/__init__.py

@@ -98,7 +98,11 @@ class TestConfig(unittest.TestCase):
                 "dangerous_temp": 120,
             },
             "fan_control": {"min_fans": 2, "speed": 90},
-            "autotuning": {"enabled": True, "psu_power_limit": 3000},
+            "autotuning": {
+                "enabled": True,
+                "mode": "power_target",
+                "power_target": 3000,
+            },
             "group": [
                 {
                     "name": "W91Q1L",
@@ -112,10 +116,10 @@ class TestConfig(unittest.TestCase):
                     "quota": 1,
                 }
             ],
-            "power_scaling": {
+            "performance_scaling": {
                 "enabled": True,
                 "power_step": 100,
-                "min_psu_power_limit": 2000,
+                "min_power_target": 2000,
                 "shutdown_enabled": True,
                 "shutdown_duration": 3,
             },
@@ -128,9 +132,9 @@ class TestConfig(unittest.TestCase):
     def test_am_modern_serialize(self):
         correct_config = {
             "bitmain-fan-ctrl": True,
-            "bitmain-fan-pwn": "90",
+            "bitmain-fan-pwm": "90",
             "freq-level": "100",
-            "miner-mode": "0",
+            "miner-mode": 0,
             "pools": [
                 {
                     "url": "stratum+tcp://stratum.test.io:3333",