version: bump version number.

README.md

@@ -23,6 +23,10 @@ Welcome to `pyasic`!  `pyasic` uses an asynchronous method of communicating with
 ## 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
     ```
@@ -36,6 +40,12 @@ It is recommended to install `pyasic` in a [virtual environment](https://realpyt
 
 `python -m pip install .` or `poetry install`
 
+##### Additional Developer Setup
+```
+poetry install --with dev
+pre-commit install
+```
+
 ---
 ## Getting started
 

docs/miners/antminer/X19.md

@@ -106,7 +106,7 @@
         show_root_heading: false
         heading_level: 4
 
-## S19 Pro+ Hydro
+## S19K Pro
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19KPro
     handler: python
     options:

docs/miners/antminer/X21.md

@@ -8,6 +8,13 @@
         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

docs/miners/supported_types.md

@@ -81,7 +81,7 @@ details {
                     <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#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>
@@ -460,6 +460,12 @@ details {
                     <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>

pyasic/config/mining.py

@@ -184,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 {
@@ -219,6 +222,12 @@ class MiningModeHashrateTune(MinerConfigValue):
             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 {
             "set_performance_mode": SetPerformanceModeRequest(

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/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/backends/braiins_os.py

@@ -181,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:

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")],
+        ),
     }
 )
 
@@ -215,6 +219,20 @@ class VNish(BMMiner):
             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:
         try:
             web_settings = await self.web.settings()

pyasic/miners/factory.py

@@ -372,8 +372,9 @@ 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,
@@ -915,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(
-                "Bitmain ", ""
+            miner_model = (
+                sock_json_data["DEVDETAILS"][0]["Model"]
+                .replace("Bitmain ", "")
+                .replace("S19XP", "S19 XP")
             )
-
             return miner_model
         except (TypeError, LookupError):
             pass
@@ -931,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

pyasic/settings/__init__.py

@@ -46,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)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyasic"
-version = "0.54.9"
+version = "0.54.14"
 description = "A simplified and standardized interface for Bitcoin ASICs."
 authors = ["UpstreamData <brett@upstreamdata.ca>"]
 repository = "https://github.com/UpstreamData/pyasic"

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,
             },