version: bump version number

pyasic/config/__init__.py

@@ -250,3 +250,9 @@ class MinerConfig:
             pools=PoolConfig.from_bitaxe(web_system_info),
             fan_mode=FanModeConfig.from_bitaxe(web_system_info),
         )
+
+    @classmethod
+    def from_iceriver(cls, web_userpanel: dict) -> "MinerConfig":
+        return cls(
+            pools=PoolConfig.from_iceriver(web_userpanel),
+        )

pyasic/config/pools.py

@@ -222,6 +222,14 @@ class Pool(MinerConfigValue):
             password=web_system_info.get("stratumPassword", ""),
         )
 
+    @classmethod
+    def from_iceriver(cls, web_pool: dict) -> "Pool":
+        return cls(
+            url=web_pool["addr"],
+            user=web_pool["user"],
+            password=web_pool["pass"],
+        )
+
 
 @dataclass
 class PoolGroup(MinerConfigValue):
@@ -402,6 +410,15 @@ class PoolGroup(MinerConfigValue):
     def from_bitaxe(cls, web_system_info: dict) -> "PoolGroup":
         return cls(pools=[Pool.from_bitaxe(web_system_info)])
 
+    @classmethod
+    def from_iceriver(cls, web_userpanel: dict) -> "PoolGroup":
+        return cls(
+            pools=[
+                Pool.from_iceriver(web_pool)
+                for web_pool in web_userpanel["data"]["pools"]
+            ]
+        )
+
 
 @dataclass
 class PoolConfig(MinerConfigValue):
@@ -568,3 +585,7 @@ class PoolConfig(MinerConfigValue):
     @classmethod
     def from_bitaxe(cls, web_system_info: dict) -> "PoolConfig":
         return cls(groups=[PoolGroup.from_bitaxe(web_system_info)])
+
+    @classmethod
+    def from_iceriver(cls, web_userpanel: dict) -> "PoolConfig":
+        return cls(groups=[PoolGroup.from_iceriver(web_userpanel)])

pyasic/miners/backends/antminer.py

@@ -597,49 +597,44 @@ class AntminerOld(CGMiner):
                 pass
 
         if rpc_stats is not None:
-            try:
-                board_offset = -1
-                boards = rpc_stats["STATS"]
-                if len(boards) > 1:
-                    for board_num in range(1, 16, 5):
-                        for _b_num in range(5):
-                            b = boards[1].get(f"chain_acn{board_num + _b_num}")
+            board_offset = -1
+            boards = rpc_stats["STATS"]
+            if len(boards) > 1:
+                for board_num in range(1, 16, 5):
+                    for _b_num in range(5):
+                        b = boards[1].get(f"chain_acn{board_num + _b_num}")
 
-                            if b and not b == 0 and board_offset == -1:
-                                board_offset = board_num
-                    if board_offset == -1:
-                        board_offset = 1
+                        if b and not b == 0 and board_offset == -1:
+                            board_offset = board_num
+                if board_offset == -1:
+                    board_offset = 1
 
-                    for i in range(
-                        board_offset, board_offset + self.expected_hashboards
-                    ):
-                        hashboard = HashBoard(
-                            slot=i - board_offset, expected_chips=self.expected_chips
-                        )
+                for i in range(board_offset, board_offset + self.expected_hashboards):
+                    hashboard = HashBoard(
+                        slot=i - board_offset, expected_chips=self.expected_chips
+                    )
 
-                        chip_temp = boards[1].get(f"temp{i}")
-                        if chip_temp:
-                            hashboard.chip_temp = round(chip_temp)
+                    chip_temp = boards[1].get(f"temp{i}")
+                    if chip_temp:
+                        hashboard.chip_temp = round(chip_temp)
 
-                        temp = boards[1].get(f"temp2_{i}")
-                        if temp:
-                            hashboard.temp = round(temp)
+                    temp = boards[1].get(f"temp2_{i}")
+                    if temp:
+                        hashboard.temp = round(temp)
 
-                        hashrate = boards[1].get(f"chain_rate{i}")
-                        if hashrate:
-                            hashboard.hashrate = AlgoHashRate.SHA256(
-                                hashrate, HashUnit.SHA256.GH
-                            ).into(self.algo.unit.default)
+                    hashrate = boards[1].get(f"chain_rate{i}")
+                    if hashrate:
+                        hashboard.hashrate = AlgoHashRate.SHA256(
+                            float(hashrate), HashUnit.SHA256.GH
+                        ).into(self.algo.unit.default)
 
-                        chips = boards[1].get(f"chain_acn{i}")
-                        if chips:
-                            hashboard.chips = chips
-                            hashboard.missing = False
-                        if (not chips) or (not chips > 0):
-                            hashboard.missing = True
-                        hashboards.append(hashboard)
-            except (LookupError, ValueError, TypeError):
-                pass
+                    chips = boards[1].get(f"chain_acn{i}")
+                    if chips:
+                        hashboard.chips = chips
+                        hashboard.missing = False
+                    if (not chips) or (not chips > 0):
+                        hashboard.missing = True
+                    hashboards.append(hashboard)
 
         return hashboards
 

pyasic/miners/backends/iceriver.py

@@ -1,5 +1,6 @@
 from typing import List, Optional
 
+from pyasic import MinerConfig
 from pyasic.data import AlgoHashRate, Fan, HashBoard, HashUnit
 from pyasic.data.pools import PoolMetrics, PoolUrl
 from pyasic.device import MinerAlgo
@@ -72,6 +73,11 @@ class IceRiver(StockFirmware):
             return False
         return True
 
+    async def get_config(self) -> MinerConfig:
+        web_userpanel = await self.web.userpanel()
+
+        return MinerConfig.from_iceriver(web_userpanel)
+
     async def _get_fans(self, web_userpanel: dict = None) -> List[Fan]:
         if web_userpanel is None:
             try:
@@ -218,7 +224,6 @@ class IceRiver(StockFirmware):
         pools_data = []
         if web_userpanel is not None:
             try:
-                active_found = False
                 pools = web_userpanel["userpanel"]["data"]["pools"]
                 for pool_info in pools:
                     pool_num = pool_info.get("no")

pyproject.toml

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