version: bump version number

.github/workflows/python-publish.yml

@@ -13,10 +13,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4.2.2
       - name: Publish GH release
-        uses: softprops/action-gh-release@v0.1.14
+        uses: softprops/action-gh-release@v2.1.0
       - name: Build using poetry and publish to PyPi
-        uses: JRubics/poetry-publish@v1.11
+        uses: JRubics/poetry-publish@v2.0
         with:
           pypi_token: ${{ secrets.PYPI_API_KEY }}

docs/miners/antminer/X19.md

@@ -302,6 +302,13 @@
         show_root_heading: false
         heading_level: 4
 
+## S19k Pro (VNish)
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19kPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## T19 (VNish)
 ::: pyasic.miners.antminer.vnish.X19.T19.VNishT19
     handler: python
@@ -358,13 +365,20 @@
         show_root_heading: false
         heading_level: 4
 
-## S19j Pro (Stock)
+## S19j Pro (Hive)
 ::: pyasic.miners.antminer.hiveon.X19.S19.HiveonS19jPro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
+## S19 (Hive)
+::: pyasic.miners.antminer.hiveon.X19.S19.HiveonS19
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## S19 (LuxOS)
 ::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19
     handler: python

docs/miners/antminer/X9.md

@@ -43,6 +43,13 @@
         show_root_heading: false
         heading_level: 4
 
+## L9 (Stock)
+::: pyasic.miners.antminer.bmminer.X9.L9.BMMinerL9
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## S9 (BOS+)
 ::: pyasic.miners.antminer.bosminer.X9.S9.BOSMinerS9
     handler: python
@@ -50,7 +57,7 @@
         show_root_heading: false
         heading_level: 4
 
-## T9 (Stock)
+## T9 (Hive)
 ::: pyasic.miners.antminer.hiveon.X9.T9.HiveonT9
     handler: python
     options:

docs/miners/avalonminer/A11X.md

@@ -1,6 +1,13 @@
 # pyasic
 ## A11X Models
 
+## Avalon 1126 Pro (Stock)
+::: pyasic.miners.avalonminer.cgminer.A11X.A1126.CGMinerAvalon1126Pro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## Avalon 1166 Pro (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A11X.A1166.CGMinerAvalon1166Pro
     handler: python

docs/miners/supported_types.md

@@ -49,6 +49,7 @@ details {
                     <li><a href="../antminer/X9#s9i-stock">S9i (Stock)</a></li>
                     <li><a href="../antminer/X9#s9j-stock">S9j (Stock)</a></li>
                     <li><a href="../antminer/X9#t9-stock">T9 (Stock)</a></li>
+                    <li><a href="../antminer/X9#l9-stock">L9 (Stock)</a></li>
                 </ul>
         </details>
         <details>
@@ -377,6 +378,7 @@ details {
         <details>
             <summary>A11X Series:</summary>
                 <ul>
+                    <li><a href="../avalonminer/A11X#avalon-1126-pro-stock">Avalon 1126 Pro (Stock)</a></li>
                     <li><a href="../avalonminer/A11X#avalon-1166-pro-stock">Avalon 1166 Pro (Stock)</a></li>
                 </ul>
         </details>
@@ -531,6 +533,7 @@ details {
                     <li><a href="../antminer/X19#s19a-vnish">S19a (VNish)</a></li>
                     <li><a href="../antminer/X19#s19a-pro-vnish">S19a Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19-pro-hydro-vnish">S19 Pro Hydro (VNish)</a></li>
+                    <li><a href="../antminer/X19#s19k-pro-vnish">S19k Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#t19-vnish">T19 (VNish)</a></li>
                 </ul>
         </details>
@@ -580,13 +583,14 @@ details {
         <details>
             <summary>X9 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X9#t9-stock">T9 (Stock)</a></li>
+                    <li><a href="../antminer/X9#t9-hive">T9 (Hive)</a></li>
                 </ul>
         </details>
         <details>
             <summary>X19 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X19#s19j-pro-stock">S19j Pro (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro-hive">S19j Pro (Hive)</a></li>
+                    <li><a href="../antminer/X19#s19-hive">S19 (Hive)</a></li>
                 </ul>
         </details>
     </ul>

pyasic/config/mining/presets.py

@@ -22,7 +22,7 @@ class MiningPreset(MinerConfigValue):
             hashrate = None
         else:
             power = hr_power_split[0].replace("watt", "").strip()
-            hashrate = hr_power_split[1].replace("TH", "").strip()
+            hashrate = hr_power_split[1].replace("TH", "").replace(" LC", "").strip()
         tuned = web_preset["status"] == "tuned"
         modded_psu = web_preset["modded_psu_required"]
         return cls(

pyasic/data/__init__.py

@@ -96,7 +96,7 @@ class MinerData(BaseModel):
     expected_fans: int | None = None
 
     # temperature
-    env_temp: int | None = None
+    env_temp: float | None = None
 
     # power
     wattage: int | None = None

pyasic/device/algorithm/hashrate/unit/scrypt.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from enum import IntEnum
+from .base import AlgoHashRateUnitType
 
 
-class ScryptUnit(IntEnum):
+class ScryptUnit(AlgoHashRateUnitType):
     H = 1
     KH = int(H) * 1000
     MH = int(KH) * 1000

pyasic/device/models.py

@@ -22,6 +22,7 @@ class AntminerModels(MinerModelType):
     S9j = "S9j"
     T9 = "T9"
     D9 = "D9"
+    L9 = "L9"
     Z15 = "Z15"
     Z15Pro = "Z15 Pro"
     S17 = "S17"
@@ -295,6 +296,7 @@ class AvalonminerModels(MinerModelType):
     Avalon1047 = "Avalon 1047"
     Avalon1066 = "Avalon 1066"
     Avalon1166Pro = "Avalon 1166 Pro"
+    Avalon1126Pro = "Avalon 1126 Pro"
     Avalon1246 = "Avalon 1246"
     AvalonNano3 = "Avalon Nano 3"
 

pyasic/miners/antminer/bmminer/X9/L9.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.device.models import L9
+
+
+class BMMinerL9(AntminerModern, L9):
+    pass

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

@@ -16,5 +16,6 @@
 
 from .D9 import BMMinerD9
 from .E9 import BMMinerE9Pro
+from .L9 import BMMinerL9
 from .S9 import BMMinerS9, BMMinerS9i, BMMinerS9j
 from .T9 import BMMinerT9

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

@@ -22,6 +22,7 @@ from pyasic.miners.device.models import (
     S19aPro,
     S19j,
     S19jPro,
+    S19kPro,
     S19NoPIC,
     S19Pro,
     S19ProHydro,
@@ -62,3 +63,7 @@ class VNishS19jPro(VNish, S19jPro):
 
 class VNishS19ProHydro(VNish, S19ProHydro):
     pass
+
+
+class VNishS19kPro(VNish, S19kPro):
+    pass

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

@@ -20,6 +20,7 @@ from .S19 import (
     VNishS19aPro,
     VNishS19j,
     VNishS19jPro,
+    VNishS19kPro,
     VNishS19NoPIC,
     VNishS19Pro,
     VNishS19ProHydro,

pyasic/miners/avalonminer/cgminer/A11X/A1126.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 AvalonMiner
+from pyasic.miners.device.models import Avalon1126Pro
+
+
+class CGMinerAvalon1126Pro(AvalonMiner, Avalon1126Pro):
+    pass

pyasic/miners/avalonminer/cgminer/A11X/__init__.py

@@ -14,4 +14,5 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
+from .A1126 import CGMinerAvalon1126Pro
 from .A1166 import CGMinerAvalon1166Pro

pyasic/miners/backends/vnish.py

@@ -14,6 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
+import logging
 from typing import Optional
 
 from pyasic import MinerConfig
@@ -96,6 +97,7 @@ class VNish(VNishFirmware, BMMiner):
 
     supports_shutdown = True
     supports_presets = True
+    supports_autotuning = True
 
     data_locations = VNISH_DATA_LOC
 
@@ -272,3 +274,27 @@ class VNish(VNishFirmware, BMMiner):
             return self.config
         self.config = MinerConfig.from_vnish(web_settings, web_presets)
         return self.config
+
+    async def set_power_limit(self, wattage: int) -> bool:
+        config = await self.get_config()
+        valid_presets = [
+            preset.power
+            for preset in config.mining_mode.available_presets
+            if preset.tuned and preset.power <= wattage
+        ]
+        new_wattage = max(valid_presets)
+
+        # Set power to highest preset <= wattage
+        try:
+            await self.web.set_power_limit(new_wattage)
+            updated_settings = await self.web.settings()
+        except APIError:
+            raise
+        except Exception as e:
+            logging.warning(f"{self} - Failed to set power limit: {e}")
+            return False
+
+        if int(updated_settings["miner"]["overclock"]["preset"]) == new_wattage:
+            return True
+        else:
+            return False

pyasic/miners/device/models/antminer/X9/L9.py

@@ -0,0 +1,27 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from pyasic.device.algorithm import MinerAlgo
+from pyasic.device.models import MinerModel
+from pyasic.miners.device.makes import AntMinerMake
+
+
+class L9(AntMinerMake):
+    raw_model = MinerModel.ANTMINER.L9
+
+    expected_chips = 110
+    expected_hashboards = 3
+    expected_fans = 4
+    algo = MinerAlgo.SCRYPT

pyasic/miners/device/models/antminer/X9/__init__.py

@@ -16,5 +16,6 @@
 
 from .D9 import D9
 from .E9 import E9Pro
+from .L9 import L9
 from .S9 import S9, S9i, S9j
 from .T9 import T9

pyasic/miners/device/models/avalonminer/A11X/A1126.py

@@ -0,0 +1,27 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from pyasic.device.algorithm import MinerAlgo
+from pyasic.device.models import MinerModel
+from pyasic.miners.device.makes import AvalonMinerMake
+
+
+class Avalon1126Pro(AvalonMinerMake):
+    raw_model = MinerModel.AVALONMINER.Avalon1126Pro
+
+    expected_chips = 120
+    expected_fans = 4
+    expected_hashboards = 3
+    algo = MinerAlgo.SHA256

pyasic/miners/device/models/avalonminer/A11X/__init__.py

@@ -15,4 +15,5 @@
 # ------------------------------------------------------------------------------
 
 
+from .A1126 import Avalon1126Pro
 from .A1166 import Avalon1166Pro

pyasic/miners/factory.py

@@ -80,6 +80,7 @@ MINER_CLASSES = {
         "ANTMINER S9I": BMMinerS9i,
         "ANTMINER S9J": BMMinerS9j,
         "ANTMINER T9": BMMinerT9,
+        "ANTMINER L9": BMMinerL9,
         "ANTMINER Z15": CGMinerZ15,
         "ANTMINER Z15 PRO": BMMinerZ15Pro,
         "ANTMINER S17": BMMinerS17,
@@ -339,6 +340,7 @@ MINER_CLASSES = {
         "AVALONMINER 1026": CGMinerAvalon1026,
         "AVALONMINER 1047": CGMinerAvalon1047,
         "AVALONMINER 1066": CGMinerAvalon1066,
+        "AVALONMINER 1126PRO": CGMinerAvalon1126Pro,
         "AVALONMINER 1166PRO": CGMinerAvalon1166Pro,
         "AVALONMINER 1246": CGMinerAvalon1246,
         "AVALONMINER NANO3": CGMinerAvalonNano3,
@@ -405,6 +407,7 @@ MINER_CLASSES = {
         "ANTMINER S19A": VNishS19a,
         "ANTMINER S19A PRO": VNishS19aPro,
         "ANTMINER S19 PRO HYD.": VNishS19ProHydro,
+        "ANTMINER S19K PRO": VNishS19kPro,
         "ANTMINER T19": VNishT19,
         "ANTMINER S21": VNishS21,
     },
@@ -427,6 +430,7 @@ MINER_CLASSES = {
         None: HiveonModern,
         "ANTMINER T9": HiveonT9,
         "ANTMINER S19JPRO": HiveonS19jPro,
+        "ANTMINER S19": HiveonS19,
     },
     MinerTypes.LUX_OS: {
         None: LUXMiner,
@@ -873,7 +877,7 @@ class MinerFactory:
             if miner_type in MINER_CLASSES:
                 if miner_model is not None:
                     warnings.warn(
-                        f"Partially supported miner found: {miner_model}, please open an issue with miner data "
+                        f"Partially supported miner found: {miner_model}, type: {miner_type}, please open an issue with miner data "
                         f"and this model on GitHub (https://github.com/UpstreamData/pyasic/issues)."
                     )
                 return MINER_CLASSES[miner_type][None](ip)

pyasic/settings/__init__.py

@@ -37,7 +37,7 @@ _settings = {  # defaults
     "default_goldshell_web_password": "123456789",
     "default_auradine_web_password": "admin",
     "default_epic_web_password": "letmein",
-    "default_hive_web_password": "admin",
+    "default_hive_web_password": "root",
     "default_iceriver_web_password": "12345678",
     "default_antminer_ssh_password": "miner",
     "default_bosminer_ssh_password": "root",

pyasic/web/vnish.py

@@ -138,6 +138,15 @@ class VNishWebAPI(BaseWebAPI):
     async def settings(self) -> dict:
         return await self.send_command("settings")
 
+    async def set_power_limit(self, wattage: int) -> bool:
+        # Can only set power limit to tuned preset
+        settings = await self.settings()
+        settings["miner"]["overclock"]["preset"] = str(wattage)
+        new_settings = {"miner": {"overclock": settings["miner"]["overclock"]}}
+
+        # response will always be {"restart_required":false,"reboot_required":false} even if unsuccessful
+        return await self.send_command("settings", privileged=True, **new_settings)
+
     async def autotune_presets(self) -> dict:
         return await self.send_command("autotune/presets")
 

pyproject.toml

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