CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add config attribute to data and refactor data naming (#81)

Browse Source 
* feature: add config to MinerData.  Remove related attributes.

* feature: rename ideal and nominal to expected to make data naming consistent across files.

* refactor: run isort on all files.

* docs: update docstrings.
This commit is contained in:
UpstreamData
2023-12-21 15:20:50 -07:00
committed by GitHub
parent 3d31179562
commit 0e5b811fb9
106 changed files with 439 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
pyasic/data/__init__.py
View File

@@ -22,6 +22,9 @@ from dataclasses import asdict, dataclass, field, fields
from datetime import datetime, timezone from datetime import datetime, timezone
from typing import Any, List, Union from typing import Any, List, Union
from pyasic.config import MinerConfig
from pyasic.config.mining import MiningModePowerTune
from .error_codes import BraiinsOSError, InnosiliconError, WhatsminerError, X19Error from .error_codes import BraiinsOSError, InnosiliconError, WhatsminerError, X19Error
@@ -35,7 +38,7 @@ class HashBoard:
temp: The temperature of the PCB as an int. temp: The temperature of the PCB as an int.
chip_temp: The temperature of the chips as an int. chip_temp: The temperature of the chips as an int.
chips: The chip count of the board as an int. chips: The chip count of the board as an int.
expected_chips: The ideal chip count of the board as an int. expected_chips: The expected chip count of the board as an int.
missing: Whether the board is returned from the miners data as a bool. missing: Whether the board is returned from the miners data as a bool.
""" """
@@ -105,7 +108,7 @@ class MinerData:
hostname: The network hostname of the miner as a str. hostname: The network hostname of the miner as a str.
hashrate: The hashrate of the miner in TH/s as a float. Calculated automatically. hashrate: The hashrate of the miner in TH/s as a float. Calculated automatically.
_hashrate: Backup for hashrate found via API instead of hashboards. _hashrate: Backup for hashrate found via API instead of hashboards.
nominal_hashrate: The factory nominal hashrate of the miner in TH/s as a float. expected_hashrate: The factory nominal hashrate of the miner in TH/s as a float.
hashboards: A list of hashboards on the miner with their statistics. hashboards: A list of hashboards on the miner with their statistics.
temperature_avg: The average temperature across the boards. Calculated automatically. temperature_avg: The average temperature across the boards. Calculated automatically.
env_temp: The environment temps as a float. env_temp: The environment temps as a float.
@@ -114,10 +117,10 @@ class MinerData:
fans: A list of fans on the miner with their speeds. fans: A list of fans on the miner with their speeds.
fan_psu: The speed of the PSU on the fan if the miner collects it. fan_psu: The speed of the PSU on the fan if the miner collects it.
total_chips: The total number of chips on all boards. Calculated automatically. total_chips: The total number of chips on all boards. Calculated automatically.
ideal_chips: The ideal number of chips in the miner as an int. expected_chips: The expected number of chips in the miner as an int.
percent_ideal_chips: The percent of total chips out of the ideal count. Calculated automatically. percent_expected_chips: The percent of total chips out of the expected count. Calculated automatically.
percent_ideal_hashrate: The percent of total hashrate out of the ideal hashrate. Calculated automatically. percent_expected_hashrate: The percent of total hashrate out of the expected hashrate. Calculated automatically.
percent_ideal_wattage: The percent of total wattage out of the ideal wattage. Calculated automatically. percent_expected_wattage: The percent of total wattage out of the expected wattage. Calculated automatically.
nominal: Whether the number of chips in the miner is nominal. Calculated automatically. nominal: Whether the number of chips in the miner is nominal. Calculated automatically.
pool_split: The pool split as a str. pool_split: The pool split as a str.
pool_1_url: The first pool url on the miner as a str. pool_1_url: The first pool url on the miner as a str.
@@ -140,27 +143,24 @@ class MinerData:
fw_ver: str = None fw_ver: str = None
hostname: str = None hostname: str = None
hashrate: float = field(init=False) hashrate: float = field(init=False)
_hashrate: float = None _hashrate: float = field(repr=False, default=None)
nominal_hashrate: float = None expected_hashrate: float = None
hashboards: List[HashBoard] = field(default_factory=list) hashboards: List[HashBoard] = field(default_factory=list)
ideal_hashboards: int = None expected_hashboards: int = None
temperature_avg: int = field(init=False) temperature_avg: int = field(init=False)
env_temp: float = None env_temp: float = None
wattage: int = None wattage: int = None
wattage_limit: int = None wattage_limit: int = field(init=False)
_wattage_limit: int = field(repr=False, default=None)
fans: List[Fan] = field(default_factory=list) fans: List[Fan] = field(default_factory=list)
fan_psu: int = None fan_psu: int = None
total_chips: int = field(init=False) total_chips: int = field(init=False)
ideal_chips: int = None expected_chips: int = None
percent_ideal_chips: float = field(init=False) percent_expected_chips: float = field(init=False)
percent_ideal_hashrate: float = field(init=False) percent_expected_hashrate: float = field(init=False)
percent_ideal_wattage: float = field(init=False) percent_expected_wattage: float = field(init=False)
nominal: bool = field(init=False) nominal: bool = field(init=False)
pool_split: str = "0" config: MinerConfig = None
pool_1_url: str = "Unknown"
pool_1_user: str = "Unknown"
pool_2_url: str = ""
pool_2_user: str = ""
errors: List[ errors: List[
Union[WhatsminerError, BraiinsOSError, X19Error, InnosiliconError] Union[WhatsminerError, BraiinsOSError, X19Error, InnosiliconError]
] = field(default_factory=list) ] = field(default_factory=list)
@@ -170,7 +170,11 @@ class MinerData:
@classmethod @classmethod
def fields(cls): def fields(cls):
return [f.name for f in fields(cls)] return [f.name for f in fields(cls) if not f.name.startswith("_")]
@staticmethod
def dict_factory(x):
return {k: v for (k, v) in x if not k.startswith("_")}
def __post_init__(self): def __post_init__(self):
self.datetime = datetime.now(timezone.utc).astimezone() self.datetime = datetime.now(timezone.utc).astimezone()
@@ -248,6 +252,17 @@ class MinerData:
def hashrate(self, val): def hashrate(self, val):
self._hashrate = val self._hashrate = val
@property
def wattage_limit(self): # noqa - Skip PyCharm inspection
if self.config is not None:
if isinstance(self.config.mining_mode, MiningModePowerTune):
return self.config.mining_mode.power
return self._wattage_limit
@wattage_limit.setter
def wattage_limit(self, val: int):
self._wattage_limit = val
@property @property
def total_chips(self): # noqa - Skip PyCharm inspection def total_chips(self): # noqa - Skip PyCharm inspection
if len(self.hashboards) > 0: if len(self.hashboards) > 0:
@@ -265,48 +280,48 @@ class MinerData:
@property @property
def nominal(self): # noqa - Skip PyCharm inspection def nominal(self): # noqa - Skip PyCharm inspection
if self.total_chips is None or self.ideal_chips is None: if self.total_chips is None or self.expected_chips is None:
return None return None
return self.ideal_chips == self.total_chips return self.expected_chips == self.total_chips
@nominal.setter @nominal.setter
def nominal(self, val): def nominal(self, val):
pass pass
@property @property
def percent_ideal_chips(self): # noqa - Skip PyCharm inspection def percent_expected_chips(self): # noqa - Skip PyCharm inspection
if self.total_chips is None or self.ideal_chips is None: if self.total_chips is None or self.expected_chips is None:
return None return None
if self.total_chips == 0 or self.ideal_chips == 0: if self.total_chips == 0 or self.expected_chips == 0:
return 0 return 0
return round((self.total_chips / self.ideal_chips) * 100) return round((self.total_chips / self.expected_chips) * 100)
@percent_ideal_chips.setter @percent_expected_chips.setter
def percent_ideal_chips(self, val): def percent_expected_chips(self, val):
pass pass
@property @property
def percent_ideal_hashrate(self): # noqa - Skip PyCharm inspection def percent_expected_hashrate(self): # noqa - Skip PyCharm inspection
if self.hashrate is None or self.nominal_hashrate is None: if self.hashrate is None or self.expected_hashrate is None:
return None return None
if self.hashrate == 0 or self.nominal_hashrate == 0: if self.hashrate == 0 or self.expected_hashrate == 0:
return 0 return 0
return round((self.hashrate / self.nominal_hashrate) * 100) return round((self.hashrate / self.expected_hashrate) * 100)
@percent_ideal_hashrate.setter @percent_expected_hashrate.setter
def percent_ideal_hashrate(self, val): def percent_expected_hashrate(self, val):
pass pass
@property @property
def percent_ideal_wattage(self): # noqa - Skip PyCharm inspection def percent_expected_wattage(self): # noqa - Skip PyCharm inspection
if self.wattage_limit is None or self.wattage is None: if self.wattage_limit is None or self.wattage is None:
return None return None
if self.wattage_limit == 0 or self.wattage == 0: if self.wattage_limit == 0 or self.wattage == 0:
return 0 return 0
return round((self.wattage / self.wattage_limit) * 100) return round((self.wattage / self.wattage_limit) * 100)
@percent_ideal_wattage.setter @percent_expected_wattage.setter
def percent_ideal_wattage(self, val): def percent_expected_wattage(self, val):
pass pass
@property @property
@@ -339,7 +354,7 @@ class MinerData:
def asdict(self) -> dict: def asdict(self) -> dict:
logging.debug(f"MinerData - (To Dict) - Dumping Dict data") logging.debug(f"MinerData - (To Dict) - Dumping Dict data")
return asdict(self) return asdict(self, dict_factory=self.dict_factory)
def as_dict(self) -> dict: def as_dict(self) -> dict:
"""Get this dataclass as a dictionary. """Get this dataclass as a dictionary.

6
pyasic/load/__init__.py
View File

@@ -137,10 +137,10 @@ class _MinerPhaseBalancer:
for miner in self.miners for miner in self.miners
] ]
) )
pct_ideal_list = [d.percent_ideal for d in data] pct_expected_list = [d.percent_ideal for d in data]
pct_ideal = 0 pct_ideal = 0
if len(pct_ideal_list) > 0: if len(pct_expected_list) > 0:
pct_ideal = sum(pct_ideal_list) / len(pct_ideal_list) pct_ideal = sum(pct_expected_list) / len(pct_expected_list)
wattage = round(wattage * 1 / (pct_ideal / 100)) wattage = round(wattage * 1 / (pct_ideal / 100))

2
pyasic/miners/antminer/__init__.py
View File

@@ -17,7 +17,7 @@
from .bmminer import * from .bmminer import *
from .bosminer import * from .bosminer import *
from .cgminer import * from .cgminer import *
from .epic import *
from .hiveon import * from .hiveon import *
from .luxos import * from .luxos import *
from .vnish import * from .vnish import *
from .epic import *

2
pyasic/miners/antminer/epic/X19/__init__.py
View File

@@ -16,10 +16,10 @@
from .S19 import ( from .S19 import (
ePICS19, ePICS19,
ePICS19Pro,
ePICS19j, ePICS19j,
ePICS19jPro, ePICS19jPro,
ePICS19jProPlus, ePICS19jProPlus,
ePICS19kPro, ePICS19kPro,
ePICS19Pro,
ePICS19XP, ePICS19XP,
) )

2
pyasic/miners/antminer/hiveon/X9/T9.py
View File

@@ -54,7 +54,7 @@ class HiveonT9(Hiveon, T9):
hashboards = [] hashboards = []
for board in board_map: for board in board_map:
hashboard = HashBoard(slot=board, expected_chips=self.nominal_chips) hashboard = HashBoard(slot=board, expected_chips=self.expected_chips)
hashrate = 0 hashrate = 0
chips = 0 chips = 0
for chipset in board_map[board]: for chipset in board_map[board]:

2
pyasic/miners/backends/__init__.py
View File

@@ -21,8 +21,8 @@ from .bosminer import BOSMiner
from .btminer import BTMiner from .btminer import BTMiner
from .cgminer import CGMiner from .cgminer import CGMiner
from .cgminer_avalon import CGMinerAvalon from .cgminer_avalon import CGMinerAvalon
from .epic import ePIC
from .hiveon import Hiveon from .hiveon import Hiveon
from .luxminer import LUXMiner from .luxminer import LUXMiner
from .vnish import VNish from .vnish import VNish
from .epic import ePIC
from .whatsminer import M2X, M3X, M5X, M6X from .whatsminer import M2X, M3X, M5X, M6X

39
pyasic/miners/backends/antminer.py
View File

@@ -38,8 +38,8 @@ ANTMINER_MODERN_DATA_LOC = {
"kwargs": {"web_get_system_info": {"web": "get_system_info"}}, "kwargs": {"web_get_system_info": {"web": "get_system_info"}},
}, },
"hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}}, "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
"nominal_hashrate": { "expected_hashrate": {
"cmd": "get_nominal_hashrate", "cmd": "get_expected_hashrate",
"kwargs": {"api_stats": {"api": "stats"}}, "kwargs": {"api_stats": {"api": "stats"}},
}, },
"hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}}, "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
@@ -62,6 +62,10 @@ ANTMINER_MODERN_DATA_LOC = {
"cmd": "get_uptime", "cmd": "get_uptime",
"kwargs": {"api_stats": {"api": "stats"}}, "kwargs": {"api_stats": {"api": "stats"}},
}, },
"config": {
"cmd": "get_config",
"kwargs": {},
},
} }
@@ -198,7 +202,7 @@ class AntminerModern(BMMiner):
pass pass
return self.light return self.light
async def get_nominal_hashrate(self, api_stats: dict = None) -> Optional[float]: async def get_expected_hashrate(self, api_stats: dict = None) -> Optional[float]:
if not api_stats: if not api_stats:
try: try:
api_stats = await self.api.stats() api_stats = await self.api.stats()
@@ -207,17 +211,17 @@ class AntminerModern(BMMiner):
if api_stats: if api_stats:
try: try:
ideal_rate = api_stats["STATS"][1]["total_rateideal"] expected_rate = api_stats["STATS"][1]["total_rateideal"]
try: try:
rate_unit = api_stats["STATS"][1]["rate_unit"] rate_unit = api_stats["STATS"][1]["rate_unit"]
except KeyError: except KeyError:
rate_unit = "GH" rate_unit = "GH"
if rate_unit == "GH": if rate_unit == "GH":
return round(ideal_rate / 1000, 2) return round(expected_rate / 1000, 2)
if rate_unit == "MH": if rate_unit == "MH":
return round(ideal_rate / 1000000, 2) return round(expected_rate / 1000000, 2)
else: else:
return round(ideal_rate, 2) return round(expected_rate, 2)
except (KeyError, IndexError): except (KeyError, IndexError):
pass pass
@@ -296,10 +300,7 @@ class AntminerModern(BMMiner):
ANTMINER_OLD_DATA_LOC = { ANTMINER_OLD_DATA_LOC = {
"mac": {"cmd": "get_mac", "kwargs": {}}, "mac": {"cmd": "get_mac", "kwargs": {}},
"model": { "model": {"cmd": "get_model", "kwargs": {}},
"cmd": "get_model",
"kwargs": {},
},
"api_ver": {"cmd": "get_api_ver", "kwargs": {"api_version": {"api": "version"}}}, "api_ver": {"cmd": "get_api_ver", "kwargs": {"api_version": {"api": "version"}}},
"fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}}, "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}},
"hostname": { "hostname": {
@@ -307,8 +308,8 @@ ANTMINER_OLD_DATA_LOC = {
"kwargs": {"web_get_system_info": {"web": "get_system_info"}}, "kwargs": {"web_get_system_info": {"web": "get_system_info"}},
}, },
"hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}}, "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
"nominal_hashrate": { "expected_hashrate": {
"cmd": "get_nominal_hashrate", "cmd": "get_expected_hashrate",
"kwargs": {"api_stats": {"api": "stats"}}, "kwargs": {"api_stats": {"api": "stats"}},
}, },
"hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}}, "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
@@ -327,10 +328,8 @@ ANTMINER_OLD_DATA_LOC = {
"cmd": "is_mining", "cmd": "is_mining",
"kwargs": {"web_get_conf": {"web": "get_miner_conf"}}, "kwargs": {"web_get_conf": {"web": "get_miner_conf"}},
}, },
"uptime": { "uptime": {"cmd": "get_uptime", "kwargs": {"api_stats": {"api": "stats"}}},
"cmd": "get_uptime", "config": {"cmd": "get_config", "kwargs": {}},
"kwargs": {"api_stats": {"api": "stats"}},
},
} }
@@ -472,9 +471,11 @@ class AntminerOld(CGMiner):
if board_offset == -1: if board_offset == -1:
board_offset = 1 board_offset = 1
for i in range(board_offset, board_offset + self.ideal_hashboards): for i in range(
board_offset, board_offset + self.expected_hashboards
):
hashboard = HashBoard( hashboard = HashBoard(
slot=i - board_offset, expected_chips=self.nominal_chips slot=i - board_offset, expected_chips=self.expected_chips
) )
chip_temp = boards[1].get(f"temp{i}") chip_temp = boards[1].get(f"temp{i}")

21
pyasic/miners/backends/bfgminer.py
View File

@@ -31,8 +31,8 @@ BFGMINER_DATA_LOC = {
"fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}}, "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}},
"hostname": {"cmd": "get_hostname", "kwargs": {}}, "hostname": {"cmd": "get_hostname", "kwargs": {}},
"hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}}, "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
"nominal_hashrate": { "expected_hashrate": {
"cmd": "get_nominal_hashrate", "cmd": "get_expected_hashrate",
"kwargs": {"api_stats": {"api": "stats"}}, "kwargs": {"api_stats": {"api": "stats"}},
}, },
"hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}}, "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
@@ -46,6 +46,7 @@ BFGMINER_DATA_LOC = {
"pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}}, "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
"is_mining": {"cmd": "is_mining", "kwargs": {}}, "is_mining": {"cmd": "is_mining", "kwargs": {}},
"uptime": {"cmd": "get_uptime", "kwargs": {}}, "uptime": {"cmd": "get_uptime", "kwargs": {}},
"config": {"cmd": "get_config", "kwargs": {}},
} }
@@ -197,9 +198,11 @@ class BFGMiner(BaseMiner):
if board_offset == -1: if board_offset == -1:
board_offset = 1 board_offset = 1
for i in range(board_offset, board_offset + self.ideal_hashboards): for i in range(
board_offset, board_offset + self.expected_hashboards
):
hashboard = HashBoard( hashboard = HashBoard(
slot=i - board_offset, expected_chips=self.nominal_chips slot=i - board_offset, expected_chips=self.expected_chips
) )
chip_temp = boards[1].get(f"temp{i}") chip_temp = boards[1].get(f"temp{i}")
@@ -297,7 +300,7 @@ class BFGMiner(BaseMiner):
async def get_fault_light(self) -> bool: async def get_fault_light(self) -> bool:
return False return False
async def get_nominal_hashrate(self, api_stats: dict = None) -> Optional[float]: async def get_expected_hashrate(self, api_stats: dict = None) -> Optional[float]:
# X19 method, not sure compatibility # X19 method, not sure compatibility
if not api_stats: if not api_stats:
try: try:
@@ -307,17 +310,17 @@ class BFGMiner(BaseMiner):
if api_stats: if api_stats:
try: try:
ideal_rate = api_stats["STATS"][1]["total_rateideal"] expected_rate = api_stats["STATS"][1]["total_rateideal"]
try: try:
rate_unit = api_stats["STATS"][1]["rate_unit"] rate_unit = api_stats["STATS"][1]["rate_unit"]
except KeyError: except KeyError:
rate_unit = "GH" rate_unit = "GH"
if rate_unit == "GH": if rate_unit == "GH":
return round(ideal_rate / 1000, 2) return round(expected_rate / 1000, 2)
if rate_unit == "MH": if rate_unit == "MH":
return round(ideal_rate / 1000000, 2) return round(expected_rate / 1000000, 2)
else: else:
return round(ideal_rate, 2) return round(expected_rate, 2)
except (KeyError, IndexError): except (KeyError, IndexError):
pass pass

12
pyasic/miners/backends/bfgminer_goldshell.py
View File

@@ -29,8 +29,8 @@ GOLDSHELL_DATA_LOC = {
"fw_ver": {"cmd": "get_fw_ver", "kwargs": {"web_status": {"web": "status"}}}, "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"web_status": {"web": "status"}}},
"hostname": {"cmd": "get_hostname", "kwargs": {}}, "hostname": {"cmd": "get_hostname", "kwargs": {}},
"hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}}, "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
"nominal_hashrate": { "expected_hashrate": {
"cmd": "get_nominal_hashrate", "cmd": "get_expected_hashrate",
"kwargs": {"api_stats": {"api": "stats"}}, "kwargs": {"api_stats": {"api": "stats"}},
}, },
"hashboards": { "hashboards": {
@@ -50,6 +50,10 @@ GOLDSHELL_DATA_LOC = {
"pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}}, "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
"is_mining": {"cmd": "is_mining", "kwargs": {}}, "is_mining": {"cmd": "is_mining", "kwargs": {}},
"uptime": {"cmd": "get_uptime", "kwargs": {}}, "uptime": {"cmd": "get_uptime", "kwargs": {}},
"config": {
"cmd": "get_config",
"kwargs": {},
},
} }
@@ -128,8 +132,8 @@ class BFGMinerGoldshell(BFGMiner):
pass pass
hashboards = [ hashboards = [
HashBoard(slot=i, expected_chips=self.nominal_chips) HashBoard(slot=i, expected_chips=self.expected_chips)
for i in range(self.ideal_hashboards) for i in range(self.expected_hashboards)
] ]
if api_devs: if api_devs:

24
pyasic/miners/backends/bmminer.py
View File

@@ -32,8 +32,8 @@ BMMINER_DATA_LOC = {
"fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}}, "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}},
"hostname": {"cmd": "get_hostname", "kwargs": {}}, "hostname": {"cmd": "get_hostname", "kwargs": {}},
"hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}}, "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
"nominal_hashrate": { "expected_hashrate": {
"cmd": "get_nominal_hashrate", "cmd": "get_expected_hashrate",
"kwargs": {"api_stats": {"api": "stats"}}, "kwargs": {"api_stats": {"api": "stats"}},
}, },
"hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}}, "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
@@ -46,10 +46,8 @@ BMMINER_DATA_LOC = {
"fault_light": {"cmd": "get_fault_light", "kwargs": {}}, "fault_light": {"cmd": "get_fault_light", "kwargs": {}},
"pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}}, "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
"is_mining": {"cmd": "is_mining", "kwargs": {}}, "is_mining": {"cmd": "is_mining", "kwargs": {}},
"uptime": { "uptime": {"cmd": "get_uptime", "kwargs": {"api_stats": {"api": "stats"}}},
"cmd": "get_uptime", "config": {"cmd": "get_config", "kwargs": {}},
"kwargs": {"api_stats": {"api": "stats"}},
},
} }
@@ -247,12 +245,12 @@ class BMMiner(BaseMiner):
if len(real_slots) < 3: if len(real_slots) < 3:
real_slots = list( real_slots = list(
range(board_offset, board_offset + self.ideal_hashboards) range(board_offset, board_offset + self.expected_hashboards)
) )
for i in real_slots: for i in real_slots:
hashboard = HashBoard( hashboard = HashBoard(
slot=i - board_offset, expected_chips=self.nominal_chips slot=i - board_offset, expected_chips=self.expected_chips
) )
chip_temp = boards[1].get(f"temp{i}") chip_temp = boards[1].get(f"temp{i}")
@@ -349,7 +347,7 @@ class BMMiner(BaseMiner):
async def get_fault_light(self) -> bool: async def get_fault_light(self) -> bool:
return False return False
async def get_nominal_hashrate(self, api_stats: dict = None) -> Optional[float]: async def get_expected_hashrate(self, api_stats: dict = None) -> Optional[float]:
# X19 method, not sure compatibility # X19 method, not sure compatibility
if not api_stats: if not api_stats:
try: try:
@@ -359,17 +357,17 @@ class BMMiner(BaseMiner):
if api_stats: if api_stats:
try: try:
ideal_rate = api_stats["STATS"][1]["total_rateideal"] expected_rate = api_stats["STATS"][1]["total_rateideal"]
try: try:
rate_unit = api_stats["STATS"][1]["rate_unit"] rate_unit = api_stats["STATS"][1]["rate_unit"]
except KeyError: except KeyError:
rate_unit = "GH" rate_unit = "GH"
if rate_unit == "GH": if rate_unit == "GH":
return round(ideal_rate / 1000, 2) return round(expected_rate / 1000, 2)
if rate_unit == "MH": if rate_unit == "MH":
return round(ideal_rate / 1000000, 2) return round(expected_rate / 1000000, 2)
else: else:
return round(ideal_rate, 2) return round(expected_rate, 2)
except (KeyError, IndexError): except (KeyError, IndexError):
pass pass

29
pyasic/miners/backends/bosminer.py
View File

@@ -38,10 +38,7 @@ BOSMINER_DATA_LOC = {
}, },
}, },
"model": {"cmd": "get_model", "kwargs": {}}, "model": {"cmd": "get_model", "kwargs": {}},
"api_ver": { "api_ver": {"cmd": "get_api_ver", "kwargs": {"api_version": {"api": "version"}}},
"cmd": "get_api_ver",
"kwargs": {"api_version": {"api": "version"}},
},
"fw_ver": { "fw_ver": {
"cmd": "get_fw_ver", "cmd": "get_fw_ver",
"kwargs": { "kwargs": {
@@ -65,8 +62,8 @@ BOSMINER_DATA_LOC = {
}, },
}, },
}, },
"nominal_hashrate": { "expected_hashrate": {
"cmd": "get_nominal_hashrate", "cmd": "get_expected_hashrate",
"kwargs": {"api_devs": {"api": "devs"}}, "kwargs": {"api_devs": {"api": "devs"}},
}, },
"hashboards": { "hashboards": {
@@ -178,10 +175,8 @@ BOSMINER_DATA_LOC = {
"cmd": "is_mining", "cmd": "is_mining",
"kwargs": {"api_devdetails": {"api": "devdetails"}}, "kwargs": {"api_devdetails": {"api": "devdetails"}},
}, },
"uptime": { "uptime": {"cmd": "get_uptime", "kwargs": {"api_summary": {"api": "summary"}}},
"cmd": "get_uptime", "config": {"cmd": "get_config", "kwargs": {}},
"kwargs": {"api_summary": {"api": "summary"}},
},
} }
@@ -601,8 +596,8 @@ class BOSMiner(BaseMiner):
graphql_boards: dict = None, graphql_boards: dict = None,
): ):
hashboards = [ hashboards = [
HashBoard(slot=i, expected_chips=self.nominal_chips) HashBoard(slot=i, expected_chips=self.expected_chips)
for i in range(self.ideal_hashboards) for i in range(self.expected_hashboards)
] ]
if not graphql_boards and not (api_devs or api_temps or api_devdetails): if not graphql_boards and not (api_devs or api_temps or api_devdetails):
@@ -1063,7 +1058,7 @@ class BOSMiner(BaseMiner):
except (TypeError, AttributeError): except (TypeError, AttributeError):
return self.light return self.light
async def get_nominal_hashrate(self, api_devs: dict = None) -> Optional[float]: async def get_expected_hashrate(self, api_devs: dict = None) -> Optional[float]:
if not api_devs: if not api_devs:
try: try:
api_devs = await self.api.devs() api_devs = await self.api.devs()
@@ -1077,14 +1072,14 @@ class BOSMiner(BaseMiner):
for board in api_devs["DEVS"]: for board in api_devs["DEVS"]:
_id = board["ID"] - offset _id = board["ID"] - offset
nominal_hashrate = round(float(board["Nominal MHS"] / 1000000), 2) expected_hashrate = round(float(board["Nominal MHS"] / 1000000), 2)
if nominal_hashrate: if expected_hashrate:
hr_list.append(nominal_hashrate) hr_list.append(expected_hashrate)
if len(hr_list) == 0: if len(hr_list) == 0:
return 0 return 0
else: else:
return round( return round(
(sum(hr_list) / len(hr_list)) * self.ideal_hashboards, 2 (sum(hr_list) / len(hr_list)) * self.expected_hashboards, 2
) )
except (IndexError, KeyError): except (IndexError, KeyError):
pass pass

2
pyasic/miners/backends/bosminer_old.py
View File

@@ -145,7 +145,7 @@ class BOSMinerOld(BOSMiner):
async def get_fault_light(self, *args, **kwargs) -> bool: async def get_fault_light(self, *args, **kwargs) -> bool:
return False return False
async def get_nominal_hashrate(self, *args, **kwargs) -> Optional[float]: async def get_expected_hashrate(self, *args, **kwargs) -> Optional[float]:
return None return None
async def get_data(self, allow_warning: bool = False, **kwargs) -> MinerData: async def get_data(self, allow_warning: bool = False, **kwargs) -> MinerData:

22
pyasic/miners/backends/btminer.py
View File

@@ -50,8 +50,8 @@ BTMINER_DATA_LOC = {
"kwargs": {"api_get_miner_info": {"api": "get_miner_info"}}, "kwargs": {"api_get_miner_info": {"api": "get_miner_info"}},
}, },
"hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}}, "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
"nominal_hashrate": { "expected_hashrate": {
"cmd": "get_nominal_hashrate", "cmd": "get_expected_hashrate",
"kwargs": {"api_summary": {"api": "summary"}}, "kwargs": {"api_summary": {"api": "summary"}},
}, },
"hashboards": {"cmd": "get_hashboards", "kwargs": {"api_devs": {"api": "devs"}}}, "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_devs": {"api": "devs"}}},
@@ -88,10 +88,8 @@ BTMINER_DATA_LOC = {
}, },
"pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}}, "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
"is_mining": {"cmd": "is_mining", "kwargs": {"api_status": {"api": "status"}}}, "is_mining": {"cmd": "is_mining", "kwargs": {"api_status": {"api": "status"}}},
"uptime": { "uptime": {"cmd": "get_uptime", "kwargs": {"api_summary": {"api": "summary"}}},
"cmd": "get_uptime", "config": {"cmd": "get_config", "kwargs": {}},
"kwargs": {"api_summary": {"api": "summary"}},
},
} }
@@ -410,8 +408,8 @@ class BTMiner(BaseMiner):
async def get_hashboards(self, api_devs: dict = None) -> List[HashBoard]: async def get_hashboards(self, api_devs: dict = None) -> List[HashBoard]:
hashboards = [ hashboards = [
HashBoard(slot=i, expected_chips=self.nominal_chips) HashBoard(slot=i, expected_chips=self.expected_chips)
for i in range(self.ideal_hashboards) for i in range(self.expected_hashboards)
] ]
if not api_devs: if not api_devs:
@@ -426,10 +424,10 @@ class BTMiner(BaseMiner):
if len(hashboards) < board["ASC"] + 1: if len(hashboards) < board["ASC"] + 1:
hashboards.append( hashboards.append(
HashBoard( HashBoard(
slot=board["ASC"], expected_chips=self.nominal_chips slot=board["ASC"], expected_chips=self.expected_chips
) )
) )
self.ideal_hashboards += 1 self.expected_hashboards += 1
hashboards[board["ASC"]].chip_temp = round(board["Chip Temp Avg"]) hashboards[board["ASC"]].chip_temp = round(board["Chip Temp Avg"])
hashboards[board["ASC"]].temp = round(board["Temperature"]) hashboards[board["ASC"]].temp = round(board["Temperature"])
hashboards[board["ASC"]].hashrate = round( hashboards[board["ASC"]].hashrate = round(
@@ -592,7 +590,7 @@ class BTMiner(BaseMiner):
return errors return errors
async def get_nominal_hashrate(self, api_summary: dict = None): async def get_expected_hashrate(self, api_summary: dict = None):
if not api_summary: if not api_summary:
try: try:
api_summary = await self.api.summary() api_summary = await self.api.summary()
@@ -601,7 +599,7 @@ class BTMiner(BaseMiner):
if api_summary: if api_summary:
try: try:
nominal_hashrate = api_summary["SUMMARY"][0]["Factory GHS"] expected_hashrate = api_summary["SUMMARY"][0]["Factory GHS"]
if nominal_hashrate: if nominal_hashrate:
return round(nominal_hashrate / 1000, 2) return round(nominal_hashrate / 1000, 2)
except (KeyError, IndexError): except (KeyError, IndexError):

26
pyasic/miners/backends/cgminer.py
View File

@@ -32,8 +32,8 @@ CGMINER_DATA_LOC = {
"fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}}, "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}},
"hostname": {"cmd": "get_hostname", "kwargs": {}}, "hostname": {"cmd": "get_hostname", "kwargs": {}},
"hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}}, "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
"nominal_hashrate": { "expected_hashrate": {
"cmd": "get_nominal_hashrate", "cmd": "get_expected_hashrate",
"kwargs": {"api_stats": {"api": "stats"}}, "kwargs": {"api_stats": {"api": "stats"}},
}, },
"hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}}, "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
@@ -46,10 +46,8 @@ CGMINER_DATA_LOC = {
"fault_light": {"cmd": "get_fault_light", "kwargs": {}}, "fault_light": {"cmd": "get_fault_light", "kwargs": {}},
"pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}}, "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
"is_mining": {"cmd": "is_mining", "kwargs": {}}, "is_mining": {"cmd": "is_mining", "kwargs": {}},
"uptime": { "uptime": {"cmd": "get_uptime", "kwargs": {"api_stats": {"api": "stats"}}},
"cmd": "get_uptime", "config": {"cmd": "get_config", "kwargs": {}},
"kwargs": {"api_stats": {"api": "stats"}},
},
} }
@@ -259,9 +257,11 @@ class CGMiner(BaseMiner):
if board_offset == -1: if board_offset == -1:
board_offset = 1 board_offset = 1
for i in range(board_offset, board_offset + self.ideal_hashboards): for i in range(
board_offset, board_offset + self.expected_hashboards
):
hashboard = HashBoard( hashboard = HashBoard(
slot=i - board_offset, expected_chips=self.nominal_chips slot=i - board_offset, expected_chips=self.expected_chips
) )
chip_temp = boards[1].get(f"temp{i}") chip_temp = boards[1].get(f"temp{i}")
@@ -360,7 +360,7 @@ class CGMiner(BaseMiner):
async def get_fault_light(self) -> bool: async def get_fault_light(self) -> bool:
return False return False
async def get_nominal_hashrate(self, api_stats: dict = None) -> Optional[float]: async def get_expected_hashrate(self, api_stats: dict = None) -> Optional[float]:
# X19 method, not sure compatibility # X19 method, not sure compatibility
if not api_stats: if not api_stats:
try: try:
@@ -370,17 +370,17 @@ class CGMiner(BaseMiner):
if api_stats: if api_stats:
try: try:
ideal_rate = api_stats["STATS"][1]["total_rateideal"] expected_rate = api_stats["STATS"][1]["total_rateideal"]
try: try:
rate_unit = api_stats["STATS"][1]["rate_unit"] rate_unit = api_stats["STATS"][1]["rate_unit"]
except KeyError: except KeyError:
rate_unit = "GH" rate_unit = "GH"
if rate_unit == "GH": if rate_unit == "GH":
return round(ideal_rate / 1000, 2) return round(expected_rate / 1000, 2)
if rate_unit == "MH": if rate_unit == "MH":
return round(ideal_rate / 1000000, 2) return round(expected_rate / 1000000, 2)
else: else:
return round(ideal_rate, 2) return round(expected_rate, 2)
except (KeyError, IndexError): except (KeyError, IndexError):
pass pass

13
pyasic/miners/backends/cgminer_avalon.py
View File

@@ -31,8 +31,8 @@ AVALON_DATA_LOC = {
"fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}}, "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"api_version": {"api": "version"}}},
"hostname": {"cmd": "get_hostname", "kwargs": {"mac": {"api": "version"}}}, "hostname": {"cmd": "get_hostname", "kwargs": {"mac": {"api": "version"}}},
"hashrate": {"cmd": "get_hashrate", "kwargs": {"api_devs": {"api": "devs"}}}, "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_devs": {"api": "devs"}}},
"nominal_hashrate": { "expected_hashrate": {
"cmd": "get_nominal_hashrate", "cmd": "get_expected_hashrate",
"kwargs": {"api_stats": {"api": "stats"}}, "kwargs": {"api_stats": {"api": "stats"}},
}, },
"hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}}, "hashboards": {"cmd": "get_hashboards", "kwargs": {"api_stats": {"api": "stats"}}},
@@ -52,6 +52,7 @@ AVALON_DATA_LOC = {
"pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}}, "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
"is_mining": {"cmd": "is_mining", "kwargs": {}}, "is_mining": {"cmd": "is_mining", "kwargs": {}},
"uptime": {"cmd": "get_uptime", "kwargs": {}}, "uptime": {"cmd": "get_uptime", "kwargs": {}},
"config": {"cmd": "get_config", "kwargs": {}},
} }
@@ -201,8 +202,8 @@ class CGMinerAvalon(CGMiner):
async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]: async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
hashboards = [ hashboards = [
HashBoard(slot=i, expected_chips=self.nominal_chips) HashBoard(slot=i, expected_chips=self.expected_chips)
for i in range(self.ideal_hashboards) for i in range(self.expected_hashboards)
] ]
if not api_stats: if not api_stats:
@@ -218,7 +219,7 @@ class CGMinerAvalon(CGMiner):
except (IndexError, KeyError, ValueError, TypeError): except (IndexError, KeyError, ValueError, TypeError):
return hashboards return hashboards
for board in range(self.ideal_hashboards): for board in range(self.expected_hashboards):
try: try:
hashboards[board].chip_temp = int(parsed_stats["MTmax"][board]) hashboards[board].chip_temp = int(parsed_stats["MTmax"][board])
except LookupError: except LookupError:
@@ -247,7 +248,7 @@ class CGMinerAvalon(CGMiner):
return hashboards return hashboards
async def get_nominal_hashrate(self, api_stats: dict = None) -> Optional[float]: async def get_expected_hashrate(self, api_stats: dict = None) -> Optional[float]:
if not api_stats: if not api_stats:
try: try:
api_stats = await self.api.stats() api_stats = await self.api.stats()

9
pyasic/miners/backends/epic.py
View File

@@ -30,7 +30,7 @@ EPIC_DATA_LOC = {
"fw_ver": {"cmd": "get_fw_ver", "kwargs": {"web_summary": {"web": "summary"}}}, "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"web_summary": {"web": "summary"}}},
"hostname": {"cmd": "get_hostname", "kwargs": {"web_summary": {"web": "summary"}}}, "hostname": {"cmd": "get_hostname", "kwargs": {"web_summary": {"web": "summary"}}},
"hashrate": {"cmd": "get_hashrate", "kwargs": {"web_summary": {"web": "summary"}}}, "hashrate": {"cmd": "get_hashrate", "kwargs": {"web_summary": {"web": "summary"}}},
"nominal_hashrate": { "expected_hashrate": {
"cmd": "get_nominal_hashrate", "cmd": "get_nominal_hashrate",
"kwargs": {"web_summary": {"web": "summary"}}, "kwargs": {"web_summary": {"web": "summary"}},
}, },
@@ -54,6 +54,7 @@ EPIC_DATA_LOC = {
"is_mining": {"cmd": "is_mining", "kwargs": {}}, "is_mining": {"cmd": "is_mining", "kwargs": {}},
"uptime": {"cmd": "get_uptime", "kwargs": {"web_summary": {"web": "summary"}}}, "uptime": {"cmd": "get_uptime", "kwargs": {"web_summary": {"web": "summary"}}},
"errors": {"cmd": "get_errors", "kwargs": {"web_summary": {"web": "summary"}}}, "errors": {"cmd": "get_errors", "kwargs": {"web_summary": {"web": "summary"}}},
"config": {"cmd": "get_config", "kwargs": {}},
} }
@@ -161,7 +162,7 @@ class ePIC(BMMiner):
logger.error(e) logger.error(e)
pass pass
async def get_nominal_hashrate(self, web_summary: dict = None) -> Optional[float]: async def get_expected_hashrate(self, web_summary: dict = None) -> Optional[float]:
# get hr from API # get hr from API
if not web_summary: if not web_summary:
try: try:
@@ -228,8 +229,8 @@ class ePIC(BMMiner):
except APIError: except APIError:
pass pass
hb_list = [ hb_list = [
HashBoard(slot=i, expected_chips=self.nominal_chips) HashBoard(slot=i, expected_chips=self.expected_chips)
for i in range(self.ideal_hashboards) for i in range(self.expected_hashboards)
] ]
if web_summary["HBs"] != None: if web_summary["HBs"] != None:
for hb in web_summary["HBs"]: for hb in web_summary["HBs"]:

92
pyasic/miners/backends/luxminer.py
View File

@@ -30,69 +30,25 @@ from pyasic.miners.base import BaseMiner
from pyasic.web.bosminer import BOSMinerWebAPI from pyasic.web.bosminer import BOSMinerWebAPI
LUXMINER_DATA_LOC = { LUXMINER_DATA_LOC = {
"mac": { "mac": {"cmd": "get_mac", "kwargs": {"api_config": {"api": "config"}}},
"cmd": "get_mac",
"kwargs": {"api_config": {"api": "config"}},
},
"model": {"cmd": "get_model", "kwargs": {}}, "model": {"cmd": "get_model", "kwargs": {}},
"api_ver": { "api_ver": {"cmd": "get_api_ver", "kwargs": {}},
"cmd": "get_api_ver", "fw_ver": {"cmd": "get_fw_ver", "kwargs": {}},
"kwargs": {}, "hostname": {"cmd": "get_hostname", "kwargs": {}},
}, "hashrate": {"cmd": "get_hashrate", "kwargs": {}},
"fw_ver": { "expected_hashrate": {"cmd": "get_nominal_hashrate", "kwargs": {}},
"cmd": "get_fw_ver", "hashboards": {"cmd": "get_hashboards", "kwargs": {}},
"kwargs": {}, "wattage": {"cmd": "get_wattage", "kwargs": {}},
}, "wattage_limit": {"cmd": "get_wattage_limit", "kwargs": {}},
"hostname": { "fans": {"cmd": "get_fans", "kwargs": {}},
"cmd": "get_hostname",
"kwargs": {},
},
"hashrate": {
"cmd": "get_hashrate",
"kwargs": {},
},
"nominal_hashrate": {
"cmd": "get_nominal_hashrate",
"kwargs": {},
},
"hashboards": {
"cmd": "get_hashboards",
"kwargs": {},
},
"wattage": {
"cmd": "get_wattage",
"kwargs": {},
},
"wattage_limit": {
"cmd": "get_wattage_limit",
"kwargs": {},
},
"fans": {
"cmd": "get_fans",
"kwargs": {},
},
"fan_psu": {"cmd": "get_fan_psu", "kwargs": {}}, "fan_psu": {"cmd": "get_fan_psu", "kwargs": {}},
"env_temp": {"cmd": "get_env_temp", "kwargs": {}}, "env_temp": {"cmd": "get_env_temp", "kwargs": {}},
"errors": { "errors": {"cmd": "get_errors", "kwargs": {}},
"cmd": "get_errors", "fault_light": {"cmd": "get_fault_light", "kwargs": {}},
"kwargs": {}, "pools": {"cmd": "get_pools", "kwargs": {}},
}, "is_mining": {"cmd": "is_mining", "kwargs": {}},
"fault_light": { "uptime": {"cmd": "get_uptime", "kwargs": {"api_stats": {"api": "stats"}}},
"cmd": "get_fault_light", "config": {"cmd": "get_config", "kwargs": {}},
"kwargs": {},
},
"pools": {
"cmd": "get_pools",
"kwargs": {},
},
"is_mining": {
"cmd": "is_mining",
"kwargs": {},
},
"uptime": {
"cmd": "get_uptime",
"kwargs": {"api_stats": {"api": "stats"}},
},
} }
@@ -277,9 +233,11 @@ class LUXMiner(BaseMiner):
if board_offset == -1: if board_offset == -1:
board_offset = 1 board_offset = 1
for i in range(board_offset, board_offset + self.ideal_hashboards): for i in range(
board_offset, board_offset + self.expected_hashboards
):
hashboard = HashBoard( hashboard = HashBoard(
slot=i - board_offset, expected_chips=self.nominal_chips slot=i - board_offset, expected_chips=self.expected_chips
) )
chip_temp = boards[1].get(f"temp{i}") chip_temp = boards[1].get(f"temp{i}")
@@ -401,7 +359,7 @@ class LUXMiner(BaseMiner):
async def get_fault_light(self) -> bool: async def get_fault_light(self) -> bool:
pass pass
async def get_nominal_hashrate(self, api_stats: dict = None) -> Optional[float]: async def get_expected_hashrate(self, api_stats: dict = None) -> Optional[float]:
if not api_stats: if not api_stats:
try: try:
api_stats = await self.api.stats() api_stats = await self.api.stats()
@@ -410,17 +368,17 @@ class LUXMiner(BaseMiner):
if api_stats: if api_stats:
try: try:
ideal_rate = api_stats["STATS"][1]["total_rateideal"] expected_rate = api_stats["STATS"][1]["total_rateideal"]
try: try:
rate_unit = api_stats["STATS"][1]["rate_unit"] rate_unit = api_stats["STATS"][1]["rate_unit"]
except KeyError: except KeyError:
rate_unit = "GH" rate_unit = "GH"
if rate_unit == "GH": if rate_unit == "GH":
return round(ideal_rate / 1000, 2) return round(expected_rate / 1000, 2)
if rate_unit == "MH": if rate_unit == "MH":
return round(ideal_rate / 1000000, 2) return round(expected_rate / 1000000, 2)
else: else:
return round(ideal_rate, 2) return round(expected_rate, 2)
except (KeyError, IndexError): except (KeyError, IndexError):
pass pass

3
pyasic/miners/backends/vnish.py
View File

@@ -28,7 +28,7 @@ VNISH_DATA_LOC = {
"fw_ver": {"cmd": "get_fw_ver", "kwargs": {"web_summary": {"web": "summary"}}}, "fw_ver": {"cmd": "get_fw_ver", "kwargs": {"web_summary": {"web": "summary"}}},
"hostname": {"cmd": "get_hostname", "kwargs": {"web_summary": {"web": "summary"}}}, "hostname": {"cmd": "get_hostname", "kwargs": {"web_summary": {"web": "summary"}}},
"hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}}, "hashrate": {"cmd": "get_hashrate", "kwargs": {"api_summary": {"api": "summary"}}},
"nominal_hashrate": { "expected_hashrate": {
"cmd": "get_nominal_hashrate", "cmd": "get_nominal_hashrate",
"kwargs": {"api_stats": {"api": "stats"}}, "kwargs": {"api_stats": {"api": "stats"}},
}, },
@@ -46,6 +46,7 @@ VNISH_DATA_LOC = {
"pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}}, "pools": {"cmd": "get_pools", "kwargs": {"api_pools": {"api": "pools"}}},
"is_mining": {"cmd": "is_mining", "kwargs": {}}, "is_mining": {"cmd": "is_mining", "kwargs": {}},
"uptime": {"cmd": "get_uptime", "kwargs": {}}, "uptime": {"cmd": "get_uptime", "kwargs": {}},
"config": {"cmd": "get_config", "kwargs": {}},
} }

38
pyasic/miners/base.py
View File

@@ -42,8 +42,8 @@ class BaseMiner(ABC):
self.make = None self.make = None
self.model = None self.model = None
# physical attributes # physical attributes
self.ideal_hashboards = 3 self.expected_hashboards = 3
self.nominal_chips = 0 self.expected_chips = 0
self.fan_count = 2 self.fan_count = 2
# data gathering locations # data gathering locations
self.data_locations = None self.data_locations = None
@@ -173,7 +173,7 @@ class BaseMiner(ABC):
@abstractmethod @abstractmethod
async def get_config(self) -> MinerConfig: async def get_config(self) -> MinerConfig:
# Not a data gathering function, since this is used for configuration and not MinerData # Not a data gathering function, since this is used for configuration
"""Get the mining configuration of the miner and return it as a [`MinerConfig`][pyasic.config.MinerConfig]. """Get the mining configuration of the miner and return it as a [`MinerConfig`][pyasic.config.MinerConfig].
Returns: Returns:
@@ -387,7 +387,7 @@ class BaseMiner(ABC):
pass pass
@abstractmethod @abstractmethod
async def get_nominal_hashrate(self, *args, **kwargs) -> Optional[float]: async def get_expected_hashrate(self, *args, **kwargs) -> Optional[float]:
"""Get the nominal hashrate from factory if available. """Get the nominal hashrate from factory if available.
Returns: Returns:
@@ -491,29 +491,7 @@ class BaseMiner(ABC):
continue continue
function = getattr(self, self.data_locations[data_name]["cmd"]) function = getattr(self, self.data_locations[data_name]["cmd"])
if not data_name == "pools":
miner_data[data_name] = await function(**args_to_send) miner_data[data_name] = await function(**args_to_send)
else:
pools_data = await function(**args_to_send)
if pools_data:
try:
miner_data["pool_1_url"] = pools_data[0]["pool_1_url"]
miner_data["pool_1_user"] = pools_data[0]["pool_1_user"]
except KeyError:
pass
if len(pools_data) > 1:
miner_data["pool_2_url"] = pools_data[1]["pool_1_url"]
miner_data["pool_2_user"] = pools_data[1]["pool_1_user"]
miner_data[
"pool_split"
] = f"{pools_data[0]['quota']}/{pools_data[1]['quota']}"
else:
try:
miner_data["pool_2_url"] = pools_data[0]["pool_2_url"]
miner_data["pool_2_user"] = pools_data[0]["pool_2_user"]
miner_data["quota"] = "0"
except KeyError:
pass
return miner_data return miner_data
async def get_data( async def get_data(
@@ -532,11 +510,11 @@ class BaseMiner(ABC):
data = MinerData( data = MinerData(
ip=str(self.ip), ip=str(self.ip),
make=self.make, make=self.make,
ideal_chips=self.nominal_chips * self.ideal_hashboards, expected_chips=self.expected_chips * self.expected_hashboards,
ideal_hashboards=self.ideal_hashboards, expected_hashboards=self.expected_hashboards,
hashboards=[ hashboards=[
HashBoard(slot=i, expected_chips=self.nominal_chips) HashBoard(slot=i, expected_chips=self.expected_chips)
for i in range(self.ideal_hashboards) for i in range(self.expected_hashboards)
], ],
) )

4
pyasic/miners/innosilicon/cgminer/A10X/A10X.py
View File

@@ -152,8 +152,8 @@ class CGMinerA10X(CGMiner, A10X):
self, api_stats: dict = None, web_get_all: dict = None self, api_stats: dict = None, web_get_all: dict = None
) -> List[HashBoard]: ) -> List[HashBoard]:
hashboards = [ hashboards = [
HashBoard(slot=i, expected_chips=self.nominal_chips) HashBoard(slot=i, expected_chips=self.expected_chips)
for i in range(self.ideal_hashboards) for i in range(self.expected_hashboards)
] ]
if web_get_all: if web_get_all:
web_get_all = web_get_all["all"] web_get_all = web_get_all["all"]

4
pyasic/miners/innosilicon/cgminer/T3X/T3H.py
View File

@@ -133,8 +133,8 @@ class CGMinerT3HPlus(CGMiner, T3HPlus):
web_get_all = web_get_all["all"] web_get_all = web_get_all["all"]
hashboards = [ hashboards = [
HashBoard(slot=i, expected_chips=self.nominal_chips) HashBoard(slot=i, expected_chips=self.expected_chips)
for i in range(self.ideal_hashboards) for i in range(self.expected_hashboards)
] ]
if not api_stats: if not api_stats:

2
pyasic/miners/types/antminer/X15/Z15.py
View File

@@ -22,5 +22,5 @@ class Z15(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Z15" self.model = "Z15"
self.nominal_chips = 3 self.expected_chips = 3
self.fan_count = 2 self.fan_count = 2

8
pyasic/miners/types/antminer/X17/S17.py
View File

@@ -22,7 +22,7 @@ class S17(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "S17" self.model = "S17"
self.nominal_chips = 48 self.expected_chips = 48
self.fan_count = 4 self.fan_count = 4
@@ -30,7 +30,7 @@ class S17Plus(AntMiner): # noqa - ignore ABC method implementation
def __init__(self, ip: str, api_ver: str = "0.0.0"): def __init__(self, ip: str, api_ver: str = "0.0.0"):
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.model = "S17+" self.model = "S17+"
self.nominal_chips = 65 self.expected_chips = 65
self.fan_count = 4 self.fan_count = 4
@@ -39,7 +39,7 @@ class S17Pro(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "S17 Pro" self.model = "S17 Pro"
self.nominal_chips = 48 self.expected_chips = 48
self.fan_count = 4 self.fan_count = 4
@@ -48,5 +48,5 @@ class S17e(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "S17e" self.model = "S17e"
self.nominal_chips = 135 self.expected_chips = 135
self.fan_count = 4 self.fan_count = 4

6
pyasic/miners/types/antminer/X17/T17.py
View File

@@ -22,7 +22,7 @@ class T17(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "T17" self.model = "T17"
self.nominal_chips = 30 self.expected_chips = 30
self.fan_count = 4 self.fan_count = 4
@@ -31,7 +31,7 @@ class T17Plus(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "T17+" self.model = "T17+"
self.nominal_chips = 44 self.expected_chips = 44
self.fan_count = 4 self.fan_count = 4
@@ -40,5 +40,5 @@ class T17e(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "T17e" self.model = "T17e"
self.nominal_chips = 78 self.expected_chips = 78
self.fan_count = 4 self.fan_count = 4

10
pyasic/miners/types/antminer/X19/S19.py
View File

@@ -22,7 +22,7 @@ class S19(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "S19" self.model = "S19"
self.nominal_chips = 76 self.expected_chips = 76
self.fan_count = 4 self.fan_count = 4
@@ -40,7 +40,7 @@ class S19Pro(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "S19 Pro" self.model = "S19 Pro"
self.nominal_chips = 114 self.expected_chips = 114
self.fan_count = 4 self.fan_count = 4
@@ -67,7 +67,7 @@ class S19ProPlus(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "S19 Pro+" self.model = "S19 Pro+"
self.nominal_chips = 120 self.expected_chips = 120
self.fan_count = 4 self.fan_count = 4
@@ -85,7 +85,7 @@ class S19a(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "S19a" self.model = "S19a"
self.nominal_chips = 72 self.expected_chips = 72
self.fan_count = 4 self.fan_count = 4
@@ -148,7 +148,7 @@ class S19L(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "S19L" self.model = "S19L"
self.nominal_chips = 76 self.expected_chips = 76
self.fan_count = 4 self.fan_count = 4

2
pyasic/miners/types/antminer/X19/T19.py
View File

@@ -22,5 +22,5 @@ class T19(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "T19" self.model = "T19"
self.nominal_chips = 76 self.expected_chips = 76
self.fan_count = 4 self.fan_count = 4

4
pyasic/miners/types/antminer/X3/D3.py
View File

@@ -22,6 +22,6 @@ class D3(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "D3" self.model = "D3"
self.nominal_chips = 60 self.expected_chips = 60
self.ideal_hashboards = 3 self.expected_hashboards = 3
self.fan_count = 2 self.fan_count = 2

4
pyasic/miners/types/antminer/X3/HS3.py
View File

@@ -22,6 +22,6 @@ class HS3(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "HS3" self.model = "HS3"
self.nominal_chips = 92 self.expected_chips = 92
self.ideal_hashboards = 3 self.expected_hashboards = 3
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/antminer/X3/L3.py
View File

@@ -21,5 +21,5 @@ class L3Plus(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "L3+" self.model = "L3+"
self.nominal_chips = 72 self.expected_chips = 72
self.fan_count = 2 self.fan_count = 2

4
pyasic/miners/types/antminer/X5/DR5.py
View File

@@ -22,6 +22,6 @@ class DR5(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "DR5" self.model = "DR5"
self.nominal_chips = 72 self.expected_chips = 72
self.ideal_hashboards = 3 self.expected_hashboards = 3
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/antminer/X7/L7.py
View File

@@ -21,5 +21,5 @@ class L7(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "L7" self.model = "L7"
self.nominal_chips = 120 self.expected_chips = 120
self.fan_count = 4 self.fan_count = 4

4
pyasic/miners/types/antminer/X9/E9.py
View File

@@ -22,6 +22,6 @@ class E9Pro(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "E9Pro" self.model = "E9Pro"
self.nominal_chips = 8 self.expected_chips = 8
self.ideal_hashboards = 2 self.expected_hashboards = 2
self.fan_count = 4 self.fan_count = 4

4
pyasic/miners/types/antminer/X9/S9.py
View File

@@ -22,7 +22,7 @@ class S9(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "S9" self.model = "S9"
self.nominal_chips = 63 self.expected_chips = 63
self.fan_count = 2 self.fan_count = 2
@@ -31,7 +31,7 @@ class S9i(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "S9i" self.model = "S9i"
self.nominal_chips = 63 self.expected_chips = 63
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/antminer/X9/T9.py
View File

@@ -22,5 +22,5 @@ class T9(AntMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "T9" self.model = "T9"
self.nominal_chips = 54 self.expected_chips = 54
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/avalonminer/A10X/A1026.py
View File

@@ -22,5 +22,5 @@ class Avalon1026(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 1026" self.model = "Avalon 1026"
self.nominal_chips = 80 self.expected_chips = 80
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/avalonminer/A10X/A1047.py
View File

@@ -22,5 +22,5 @@ class Avalon1047(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 1047" self.model = "Avalon 1047"
self.nominal_chips = 80 self.expected_chips = 80
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/avalonminer/A10X/A1066.py
View File

@@ -22,5 +22,5 @@ class Avalon1066(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 1066" self.model = "Avalon 1066"
self.nominal_chips = 114 self.expected_chips = 114
self.fan_count = 4 self.fan_count = 4

2
pyasic/miners/types/avalonminer/A11X/A1166.py
View File

@@ -23,5 +23,5 @@ class Avalon1166Pro(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 1166 Pro" self.model = "Avalon 1166 Pro"
self.nominal_chips = 120 self.expected_chips = 120
self.fan_count = 4 self.fan_count = 4

2
pyasic/miners/types/avalonminer/A12X/A1246.py
View File

@@ -23,5 +23,5 @@ class Avalon1246(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 1246" self.model = "Avalon 1246"
self.nominal_chips = 120 self.expected_chips = 120
self.fan_count = 4 self.fan_count = 4

4
pyasic/miners/types/avalonminer/A7X/A721.py
View File

@@ -22,6 +22,6 @@ class Avalon721(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 721" self.model = "Avalon 721"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 18 self.expected_chips = 18
self.fan_count = 1 self.fan_count = 1

4
pyasic/miners/types/avalonminer/A7X/A741.py
View File

@@ -22,6 +22,6 @@ class Avalon741(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 741" self.model = "Avalon 741"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 22 self.expected_chips = 22
self.fan_count = 1 self.fan_count = 1

4
pyasic/miners/types/avalonminer/A7X/A761.py
View File

@@ -22,6 +22,6 @@ class Avalon761(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 761" self.model = "Avalon 761"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 18 self.expected_chips = 18
self.fan_count = 1 self.fan_count = 1

4
pyasic/miners/types/avalonminer/A8X/A821.py
View File

@@ -22,6 +22,6 @@ class Avalon821(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 821" self.model = "Avalon 821"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 26 self.expected_chips = 26
self.fan_count = 1 self.fan_count = 1

4
pyasic/miners/types/avalonminer/A8X/A841.py
View File

@@ -22,6 +22,6 @@ class Avalon841(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 841" self.model = "Avalon 841"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 26 self.expected_chips = 26
self.fan_count = 1 self.fan_count = 1

4
pyasic/miners/types/avalonminer/A8X/A851.py
View File

@@ -22,6 +22,6 @@ class Avalon851(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 851" self.model = "Avalon 851"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 26 self.expected_chips = 26
self.fan_count = 1 self.fan_count = 1

4
pyasic/miners/types/avalonminer/A9X/A921.py
View File

@@ -22,6 +22,6 @@ class Avalon921(AvalonMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "Avalon 921" self.model = "Avalon 921"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 26 self.expected_chips = 26
self.fan_count = 1 self.fan_count = 1

4
pyasic/miners/types/goldshell/X5/CK5.py
View File

@@ -21,6 +21,6 @@ class CK5(GoldshellMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "CK5" self.model = "CK5"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 46 self.expected_chips = 46
self.fan_count = 4 self.fan_count = 4

4
pyasic/miners/types/goldshell/X5/HS5.py
View File

@@ -21,6 +21,6 @@ class HS5(GoldshellMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "HS5" self.model = "HS5"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 46 self.expected_chips = 46
self.fan_count = 4 self.fan_count = 4

4
pyasic/miners/types/goldshell/X5/KD5.py
View File

@@ -21,6 +21,6 @@ class KD5(GoldshellMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "KD5" self.model = "KD5"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 46 self.expected_chips = 46
self.fan_count = 4 self.fan_count = 4

4
pyasic/miners/types/goldshell/XMax/KDMax.py
View File

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

2
pyasic/miners/types/innosilicon/T3X/T3H.py
View File

@@ -22,5 +22,5 @@ class T3HPlus(InnosiliconMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "T3H+" self.model = "T3H+"
self.nominal_chips = 114 self.expected_chips = 114
self.fan_count = 4 self.fan_count = 4

2
pyasic/miners/types/whatsminer/M2X/M20.py
View File

@@ -22,5 +22,5 @@ class M20V10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M20 V10" self.model = "M20 V10"
self.nominal_chips = 70 self.expected_chips = 70
self.fan_count = 2 self.fan_count = 2

4
pyasic/miners/types/whatsminer/M2X/M20P.py
View File

@@ -22,7 +22,7 @@ class M20PV10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M20P V10" self.model = "M20P V10"
self.nominal_chips = 156 self.expected_chips = 156
self.fan_count = 2 self.fan_count = 2
@@ -31,5 +31,5 @@ class M20PV30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M20P V30" self.model = "M20P V30"
self.nominal_chips = 148 self.expected_chips = 148
self.fan_count = 2 self.fan_count = 2

4
pyasic/miners/types/whatsminer/M2X/M20S.py
View File

@@ -24,7 +24,7 @@ class M20SV10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M20S V10" self.model = "M20S V10"
self.nominal_chips = 105 self.expected_chips = 105
self.fan_count = 2 self.fan_count = 2
@@ -42,5 +42,5 @@ class M20SV30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M20S V30" self.model = "M20S V30"
self.nominal_chips = 140 self.expected_chips = 140
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/whatsminer/M2X/M20S_Plus.py
View File

@@ -24,7 +24,7 @@ class M20SPlusV30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M20S+ V30" self.model = "M20S+ V30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M20S+ V30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M20S+ V30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

2
pyasic/miners/types/whatsminer/M2X/M21.py
View File

@@ -24,5 +24,5 @@ class M21V10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M21 V10" self.model = "M21 V10"
self.nominal_chips = 33 self.expected_chips = 33
self.fan_count = 2 self.fan_count = 2

6
pyasic/miners/types/whatsminer/M2X/M21S.py
View File

@@ -24,7 +24,7 @@ class M21SV20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M21S V20" self.model = "M21S V20"
self.nominal_chips = 66 self.expected_chips = 66
self.fan_count = 2 self.fan_count = 2
@@ -33,7 +33,7 @@ class M21SV60(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M21S V60" self.model = "M21S V60"
self.nominal_chips = 105 self.expected_chips = 105
self.fan_count = 2 self.fan_count = 2
@@ -42,5 +42,5 @@ class M21SV70(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M21S V70" self.model = "M21S V70"
self.nominal_chips = 111 self.expected_chips = 111
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/whatsminer/M2X/M21S_Plus.py
View File

@@ -24,7 +24,7 @@ class M21SPlusV20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M21S+ V20" self.model = "M21S+ V20"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M21S+ V20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M21S+ V20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

2
pyasic/miners/types/whatsminer/M2X/M29.py
View File

@@ -24,5 +24,5 @@ class M29V10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M29 V10" self.model = "M29 V10"
self.nominal_chips = 50 self.expected_chips = 50
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/whatsminer/M3X/M30.py
View File

@@ -24,7 +24,7 @@ class M30V10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30 V10" self.model = "M30 V10"
self.nominal_chips = 105 self.expected_chips = 105
self.fan_count = 2 self.fan_count = 2

4
pyasic/miners/types/whatsminer/M3X/M30K.py
View File

@@ -24,6 +24,6 @@ class M30KV10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30K V10" self.model = "M30K V10"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 240 self.expected_chips = 240
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/whatsminer/M3X/M30L.py
View File

@@ -25,5 +25,5 @@ class M30LV10(WhatsMiner): # noqa - ignore ABC method implementation
self.ip = ip self.ip = ip
self.model = "M30L V10" self.model = "M30L V10"
self.board_num = 4 self.board_num = 4
self.nominal_chips = 144 self.expected_chips = 144
self.fan_count = 2 self.fan_count = 2

14
pyasic/miners/types/whatsminer/M3X/M30S.py
View File

@@ -24,7 +24,7 @@ class M30SV10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S V10" self.model = "M30S V10"
self.nominal_chips = 148 self.expected_chips = 148
self.fan_count = 2 self.fan_count = 2
@@ -51,7 +51,7 @@ class M30SV40(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S V40" self.model = "M30S V40"
self.nominal_chips = 172 self.expected_chips = 172
self.fan_count = 2 self.fan_count = 2
@@ -99,7 +99,7 @@ class M30SVE10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S VE10" self.model = "M30S VE10"
self.nominal_chips = 105 self.expected_chips = 105
self.fan_count = 2 self.fan_count = 2
@@ -177,7 +177,7 @@ class M30SVF20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S VF20" self.model = "M30S VF20"
self.nominal_chips = 74 self.expected_chips = 74
self.fan_count = 2 self.fan_count = 2
@@ -204,7 +204,7 @@ class M30SVG20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S VG20" self.model = "M30S VG20"
self.nominal_chips = 70 self.expected_chips = 70
self.fan_count = 2 self.fan_count = 2
@@ -231,7 +231,7 @@ class M30SVH10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S VH10" self.model = "M30S VH10"
self.nominal_chips = 64 self.expected_chips = 64
self.fan_count = 2 self.fan_count = 2
@@ -279,7 +279,7 @@ class M30SVH60(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S VH60" self.model = "M30S VH60"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M30SVH60, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M30SVH60, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

18
pyasic/miners/types/whatsminer/M3X/M30S_Plus.py
View File

@@ -24,7 +24,7 @@ class M30SPlusV10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S+ V10" self.model = "M30S+ V10"
self.nominal_chips = 215 self.expected_chips = 215
self.fan_count = 2 self.fan_count = 2
@@ -33,7 +33,7 @@ class M30SPlusV20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S+ V20" self.model = "M30S+ V20"
self.nominal_chips = 255 self.expected_chips = 255
self.fan_count = 2 self.fan_count = 2
@@ -90,7 +90,7 @@ class M30SPlusV80(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S+ V80" self.model = "M30S+ V80"
self.nominal_chips = 245 self.expected_chips = 245
self.fan_count = 2 self.fan_count = 2
@@ -117,7 +117,7 @@ class M30SPlusVE30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S+ VE30" self.model = "M30S+ VE30"
self.nominal_chips = 148 self.expected_chips = 148
self.fan_count = 2 self.fan_count = 2
@@ -144,7 +144,7 @@ class M30SPlusVE60(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S+ VE60" self.model = "M30S+ VE60"
self.nominal_chips = 172 self.expected_chips = 172
self.fan_count = 2 self.fan_count = 2
@@ -210,7 +210,7 @@ class M30SPlusVF30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S+ VF30" self.model = "M30S+ VF30"
self.nominal_chips = 117 self.expected_chips = 117
self.fan_count = 2 self.fan_count = 2
@@ -237,7 +237,7 @@ class M30SPlusVG40(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S+ VG40" self.model = "M30S+ VG40"
self.nominal_chips = 105 self.expected_chips = 105
self.fan_count = 2 self.fan_count = 2
@@ -264,7 +264,7 @@ class M30SPlusVH10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S+ VH10" self.model = "M30S+ VH10"
self.nominal_chips = 64 self.expected_chips = 64
self.fan_count = 2 self.fan_count = 2
@@ -309,5 +309,5 @@ class M30SPlusVH60(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S+ VH60" self.model = "M30S+ VH60"
self.nominal_chips = 66 self.expected_chips = 66
self.fan_count = 2 self.fan_count = 2

16
pyasic/miners/types/whatsminer/M3X/M30S_Plus_Plus.py
View File

@@ -24,8 +24,8 @@ class M30SPlusPlusV10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S++ V10" self.model = "M30S++ V10"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 255 self.expected_chips = 255
self.fan_count = 2 self.fan_count = 2
@@ -34,8 +34,8 @@ class M30SPlusPlusV20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S++ V20" self.model = "M30S++ V20"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 255 self.expected_chips = 255
self.fan_count = 2 self.fan_count = 2
@@ -62,7 +62,7 @@ class M30SPlusPlusVE50(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S++ VE50" self.model = "M30S++ VE50"
self.nominal_chips = 235 self.expected_chips = 235
self.fan_count = 2 self.fan_count = 2
@@ -119,7 +119,7 @@ class M30SPlusPlusVH20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S++ VH20" self.model = "M30S++ VH20"
self.nominal_chips = 86 self.expected_chips = 86
self.fan_count = 2 self.fan_count = 2
@@ -164,7 +164,7 @@ class M30SPlusPlusVH70(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S++ VH70" self.model = "M30S++ VH70"
self.nominal_chips = 70 self.expected_chips = 70
self.fan_count = 2 self.fan_count = 2
@@ -191,7 +191,7 @@ class M30SPlusPlusVH100(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M30S++ VH100" self.model = "M30S++ VH100"
self.nominal_chips = 82 self.expected_chips = 82
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/whatsminer/M3X/M31.py
View File

@@ -24,7 +24,7 @@ class M31V10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31 V10" self.model = "M31 V10"
self.nominal_chips = 70 self.expected_chips = 70
self.fan_count = 2 self.fan_count = 2

6
pyasic/miners/types/whatsminer/M3X/M31H.py
View File

@@ -24,7 +24,7 @@ class M31HV10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31H V10" self.model = "M31H V10"
self.nominal_chips = 114 self.expected_chips = 114
self.fan_count = 0 self.fan_count = 0
@@ -33,6 +33,6 @@ class M31HV40(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31H V40" self.model = "M31H V40"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 136 self.expected_chips = 136
self.fan_count = 0 self.fan_count = 0

2
pyasic/miners/types/whatsminer/M3X/M31L.py
View File

@@ -24,5 +24,5 @@ class M31LV10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31L V10" self.model = "M31L V10"
self.nominal_chips = 114 self.expected_chips = 114
self.fan_count = 2 self.fan_count = 2

24
pyasic/miners/types/whatsminer/M3X/M31S.py
View File

@@ -24,7 +24,7 @@ class M31SV10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S V10" self.model = "M31S V10"
self.nominal_chips = 105 self.expected_chips = 105
self.fan_count = 2 self.fan_count = 2
@@ -33,7 +33,7 @@ class M31SV20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S V20" self.model = "M31S V20"
self.nominal_chips = 111 self.expected_chips = 111
self.fan_count = 2 self.fan_count = 2
@@ -42,7 +42,7 @@ class M31SV30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S V30" self.model = "M31S V30"
self.nominal_chips = 117 self.expected_chips = 117
self.fan_count = 2 self.fan_count = 2
@@ -51,7 +51,7 @@ class M31SV40(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S V40" self.model = "M31S V40"
self.nominal_chips = 123 self.expected_chips = 123
self.fan_count = 2 self.fan_count = 2
@@ -60,7 +60,7 @@ class M31SV50(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S V50" self.model = "M31S V50"
self.nominal_chips = 78 self.expected_chips = 78
self.fan_count = 2 self.fan_count = 2
@@ -69,7 +69,7 @@ class M31SV60(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S V60" self.model = "M31S V60"
self.nominal_chips = 105 self.expected_chips = 105
self.fan_count = 2 self.fan_count = 2
@@ -78,7 +78,7 @@ class M31SV70(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S V70" self.model = "M31S V70"
self.nominal_chips = 111 self.expected_chips = 111
self.fan_count = 2 self.fan_count = 2
@@ -87,7 +87,7 @@ class M31SV80(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S V80" self.model = "M31S V80"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M31SV80, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M31SV80, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -99,7 +99,7 @@ class M31SV90(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S V90" self.model = "M31S V90"
self.nominal_chips = 117 self.expected_chips = 117
self.fan_count = 2 self.fan_count = 2
@@ -108,7 +108,7 @@ class M31SVE10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S VE10" self.model = "M31S VE10"
self.nominal_chips = 70 self.expected_chips = 70
self.fan_count = 2 self.fan_count = 2
@@ -117,7 +117,7 @@ class M31SVE20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S VE20" self.model = "M31S VE20"
self.nominal_chips = 74 self.expected_chips = 74
self.fan_count = 2 self.fan_count = 2
@@ -126,7 +126,7 @@ class M31SVE30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S VE30" self.model = "M31S VE30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M31SVE30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M31SVE30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

6
pyasic/miners/types/whatsminer/M3X/M31SE.py
View File

@@ -24,7 +24,7 @@ class M31SEV10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31SE V10" self.model = "M31SE V10"
self.nominal_chips = 82 self.expected_chips = 82
self.fan_count = 2 self.fan_count = 2
@@ -33,7 +33,7 @@ class M31SEV20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31SE V20" self.model = "M31SE V20"
self.nominal_chips = 78 self.expected_chips = 78
self.fan_count = 2 self.fan_count = 2
@@ -42,5 +42,5 @@ class M31SEV30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31SE V30" self.model = "M31SE V30"
self.nominal_chips = 78 self.expected_chips = 78
self.fan_count = 2 self.fan_count = 2

28
pyasic/miners/types/whatsminer/M3X/M31S_Plus.py
View File

@@ -24,7 +24,7 @@ class M31SPlusV10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ V10" self.model = "M31S+ V10"
self.nominal_chips = 105 self.expected_chips = 105
self.fan_count = 2 self.fan_count = 2
@@ -33,7 +33,7 @@ class M31SPlusV20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ V20" self.model = "M31S+ V20"
self.nominal_chips = 111 self.expected_chips = 111
self.fan_count = 2 self.fan_count = 2
@@ -42,7 +42,7 @@ class M31SPlusV30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ V30" self.model = "M31S+ V30"
self.nominal_chips = 117 self.expected_chips = 117
self.fan_count = 2 self.fan_count = 2
@@ -123,7 +123,7 @@ class M31SPlusVE30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ VE30" self.model = "M31S+ VE30"
self.nominal_chips = 105 self.expected_chips = 105
self.fan_count = 2 self.fan_count = 2
@@ -132,7 +132,7 @@ class M31SPlusVE40(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ VE40" self.model = "M31S+ VE40"
self.nominal_chips = 111 self.expected_chips = 111
self.fan_count = 2 self.fan_count = 2
@@ -141,7 +141,7 @@ class M31SPlusVE50(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ VE50" self.model = "M31S+ VE50"
self.nominal_chips = 117 self.expected_chips = 117
self.fan_count = 2 self.fan_count = 2
@@ -150,7 +150,7 @@ class M31SPlusVE60(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ VE60" self.model = "M31S+ VE60"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M30S+ VE60, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M30S+ VE60, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -162,7 +162,7 @@ class M31SPlusVE80(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ VE80" self.model = "M31S+ VE80"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M30S+ VE80, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M30S+ VE80, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -174,7 +174,7 @@ class M31SPlusVF20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ VF20" self.model = "M31S+ VF20"
self.nominal_chips = 66 self.expected_chips = 66
self.fan_count = 2 self.fan_count = 2
@@ -183,7 +183,7 @@ class M31SPlusVF30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ VF30" self.model = "M31S+ VF30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M30S+ VF30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M30S+ VF30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -195,7 +195,7 @@ class M31SPlusVG20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ VG20" self.model = "M31S+ VG20"
self.nominal_chips = 66 self.expected_chips = 66
self.fan_count = 2 self.fan_count = 2
@@ -204,7 +204,7 @@ class M31SPlusVG30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ VG30" self.model = "M31S+ VG30"
self.nominal_chips = 70 self.expected_chips = 70
self.fan_count = 2 self.fan_count = 2
@@ -213,7 +213,7 @@ class M31SPlusV30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ V30" self.model = "M31S+ V30"
self.nominal_chips = 117 self.expected_chips = 117
self.fan_count = 2 self.fan_count = 2
@@ -222,5 +222,5 @@ class M31SPlusV40(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M31S+ V40" self.model = "M31S+ V40"
self.nominal_chips = 123 self.expected_chips = 123
self.fan_count = 2 self.fan_count = 2

4
pyasic/miners/types/whatsminer/M3X/M32.py
View File

@@ -24,7 +24,7 @@ class M32V10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M32 V10" self.model = "M32 V10"
self.nominal_chips = 78 self.expected_chips = 78
self.fan_count = 2 self.fan_count = 2
@@ -33,5 +33,5 @@ class M32V20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M32 V20" self.model = "M32 V20"
self.nominal_chips = 74 self.expected_chips = 74
self.fan_count = 2 self.fan_count = 2

2
pyasic/miners/types/whatsminer/M3X/M32S.py
View File

@@ -22,5 +22,5 @@ class M32S(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M32S" self.model = "M32S"
self.nominal_chips = 78 self.expected_chips = 78
self.fan_count = 2 self.fan_count = 2

6
pyasic/miners/types/whatsminer/M3X/M33.py
View File

@@ -24,7 +24,7 @@ class M33V10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M33 V10" self.model = "M33 V10"
self.nominal_chips = 33 self.expected_chips = 33
self.fan_count = 0 self.fan_count = 0
@@ -33,7 +33,7 @@ class M33V20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M33 V20" self.model = "M33 V20"
self.nominal_chips = 62 self.expected_chips = 62
self.fan_count = 0 self.fan_count = 0
@@ -42,5 +42,5 @@ class M33V30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M33 V30" self.model = "M33 V30"
self.nominal_chips = 66 self.expected_chips = 66
self.fan_count = 0 self.fan_count = 0

4
pyasic/miners/types/whatsminer/M3X/M33S.py
View File

@@ -24,6 +24,6 @@ class M33SVG30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M33S VG30" self.model = "M33S VG30"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 116 self.expected_chips = 116
self.fan_count = 0 self.fan_count = 0

12
pyasic/miners/types/whatsminer/M3X/M33S_Plus.py
View File

@@ -24,8 +24,8 @@ class M33SPlusVG20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M33S+ VG20" self.model = "M33S+ VG20"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 112 self.expected_chips = 112
self.fan_count = 0 self.fan_count = 0
@@ -34,8 +34,8 @@ class M33SPlusVH20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M33S+ VH20" self.model = "M33S+ VH20"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 100 self.expected_chips = 100
self.fan_count = 0 self.fan_count = 0
@@ -44,8 +44,8 @@ class M33SPlusVH30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M33S+ VH30" self.model = "M33S+ VH30"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 0 # slot1 116, slot2 106, slot3 116, slot4 106 self.expected_chips = 0 # slot1 116, slot2 106, slot3 116, slot4 106
warnings.warn( warnings.warn(
"Unknown chip count for miner type M30S+ VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M30S+ VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

12
pyasic/miners/types/whatsminer/M3X/M33S_Plus_Plus.py
View File

@@ -24,8 +24,8 @@ class M33SPlusPlusVH20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M33S++ VH20" self.model = "M33S++ VH20"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 112 self.expected_chips = 112
self.fan_count = 0 self.fan_count = 0
@@ -34,8 +34,8 @@ class M33SPlusPlusVH30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M33S++ VH30" self.model = "M33S++ VH30"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M30S++ VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M30S++ VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -47,6 +47,6 @@ class M33SPlusPlusVG40(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M33S++ VG40" self.model = "M33S++ VG40"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 174 self.expected_chips = 174
self.fan_count = 0 self.fan_count = 0

4
pyasic/miners/types/whatsminer/M3X/M34S_Plus.py
View File

@@ -22,6 +22,6 @@ class M34SPlusVE10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M34S+ VE10" self.model = "M34S+ VE10"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 116 self.expected_chips = 116
self.fan_count = 0 self.fan_count = 0

4
pyasic/miners/types/whatsminer/M3X/M36S.py
View File

@@ -24,6 +24,6 @@ class M36SVE10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M36S VE10" self.model = "M36S VE10"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 114 self.expected_chips = 114
self.fan_count = 0 self.fan_count = 0

4
pyasic/miners/types/whatsminer/M3X/M36S_Plus.py
View File

@@ -24,6 +24,6 @@ class M36SPlusVG30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M36S+ VG30" self.model = "M36S+ VG30"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 108 self.expected_chips = 108
self.fan_count = 0 self.fan_count = 0

4
pyasic/miners/types/whatsminer/M3X/M36S_Plus_Plus.py
View File

@@ -24,6 +24,6 @@ class M36SPlusPlusVH30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M36S++ VH30" self.model = "M36S++ VH30"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 80 self.expected_chips = 80
self.fan_count = 0 self.fan_count = 0

6
pyasic/miners/types/whatsminer/M3X/M39.py
View File

@@ -24,7 +24,7 @@ class M39V10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M39 V10" self.model = "M39 V10"
self.nominal_chips = 50 self.expected_chips = 50
self.fan_count = 0 self.fan_count = 0
@@ -33,7 +33,7 @@ class M39V20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M39 V20" self.model = "M39 V20"
self.nominal_chips = 54 self.expected_chips = 54
self.fan_count = 0 self.fan_count = 0
@@ -42,5 +42,5 @@ class M39V30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M39 V30" self.model = "M39 V30"
self.nominal_chips = 68 self.expected_chips = 68
self.fan_count = 0 self.fan_count = 0

12
pyasic/miners/types/whatsminer/M5X/M50.py
View File

@@ -24,8 +24,8 @@ class M50VE30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50 VE30" self.model = "M50 VE30"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 255 self.expected_chips = 255
self.fan_count = 2 self.fan_count = 2
@@ -34,7 +34,7 @@ class M50VG30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50 VG30" self.model = "M50 VG30"
self.nominal_chips = 156 self.expected_chips = 156
self.fan_count = 2 self.fan_count = 2
@@ -43,7 +43,7 @@ class M50VH10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50 VH10" self.model = "M50 VH10"
self.nominal_chips = 86 self.expected_chips = 86
self.fan_count = 2 self.fan_count = 2
@@ -52,7 +52,7 @@ class M50VH20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50 VH20" self.model = "M50 VH20"
self.nominal_chips = 111 self.expected_chips = 111
self.fan_count = 2 self.fan_count = 2
@@ -142,7 +142,7 @@ class M50VJ30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50 VJ30" self.model = "M50 VJ30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50 VJ30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50 VJ30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

16
pyasic/miners/types/whatsminer/M5X/M50S.py
View File

@@ -24,7 +24,7 @@ class M50SVJ10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S VJ10" self.model = "M50S VJ10"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50S VJ10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50S VJ10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -36,7 +36,7 @@ class M50SVJ20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S VJ20" self.model = "M50S VJ20"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50S VJ20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50S VJ20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -48,7 +48,7 @@ class M50SVJ30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S VJ30" self.model = "M50S VJ30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50S VJ30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50S VJ30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -60,7 +60,7 @@ class M50SVH10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S VH10" self.model = "M50S VH10"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50S VH10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50S VH10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -72,7 +72,7 @@ class M50SVH20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S VH20" self.model = "M50S VH20"
self.nominal_chips = 135 self.expected_chips = 135
self.fan_count = 2 self.fan_count = 2
@@ -81,7 +81,7 @@ class M50SVH30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S VH30" self.model = "M50S VH30"
self.nominal_chips = 156 self.expected_chips = 156
self.fan_count = 2 self.fan_count = 2
@@ -90,7 +90,7 @@ class M50SVH40(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S VH40" self.model = "M50S VH40"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50S VH40, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50S VH40, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -102,7 +102,7 @@ class M50SVH50(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S VH50" self.model = "M50S VH50"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50S VH50, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50S VH50, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

8
pyasic/miners/types/whatsminer/M5X/M50S_Plus.py
View File

@@ -24,7 +24,7 @@ class M50SPlusVH30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S+ VH30" self.model = "M50S+ VH30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50S+ VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50S+ VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -36,7 +36,7 @@ class M50SPlusVH40(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S+ VH40" self.model = "M50S+ VH40"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50S+ VH40, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50S+ VH40, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -48,7 +48,7 @@ class M50SPlusVJ30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S+ VJ30" self.model = "M50S+ VJ30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50S+ VJ30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50S+ VJ30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -60,5 +60,5 @@ class M50SPlusVK20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S+ VK20" self.model = "M50S+ VK20"
self.nominal_chips = 117 self.expected_chips = 117
self.fan_count = 2 self.fan_count = 2

6
pyasic/miners/types/whatsminer/M5X/M50S_Plus_Plus.py
View File

@@ -24,7 +24,7 @@ class M50SPlusPlusVK10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S++ VK10" self.model = "M50S++ VK10"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50S+ VK10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50S+ VK10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -36,7 +36,7 @@ class M50SPlusPlusVK20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S++ VK20" self.model = "M50S++ VK20"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M50S+ VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M50S+ VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -48,5 +48,5 @@ class M50SPlusPlusVK30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M50S++ VK30" self.model = "M50S++ VK30"
self.nominal_chips = 76 self.expected_chips = 76
self.fan_count = 2 self.fan_count = 2

4
pyasic/miners/types/whatsminer/M5X/M53.py
View File

@@ -24,6 +24,6 @@ class M53VH30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M53 VH30" self.model = "M53 VH30"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 128 self.expected_chips = 128
self.fan_count = 0 self.fan_count = 0

2
pyasic/miners/types/whatsminer/M5X/M53S.py
View File

@@ -24,7 +24,7 @@ class M53SVH30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M53S VH30" self.model = "M53S VH30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M53S VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M53S VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

2
pyasic/miners/types/whatsminer/M5X/M53S_Plus.py
View File

@@ -24,7 +24,7 @@ class M53SPlusVJ30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M53S+ VJ30" self.model = "M53S+ VJ30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M53S+ VJ30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M53S+ VJ30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

4
pyasic/miners/types/whatsminer/M5X/M56.py
View File

@@ -24,6 +24,6 @@ class M56VH30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M56 VH30" self.model = "M56 VH30"
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.nominal_chips = 108 self.expected_chips = 108
self.fan_count = 0 self.fan_count = 0

2
pyasic/miners/types/whatsminer/M5X/M56S.py
View File

@@ -24,7 +24,7 @@ class M56SVH30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M56S VH30" self.model = "M56S VH30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M56S VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M56S VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

2
pyasic/miners/types/whatsminer/M5X/M56S_Plus.py
View File

@@ -24,7 +24,7 @@ class M56SPlusVJ30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M56S+ VJ30" self.model = "M56S+ VJ30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M56S+ VJ30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M56S+ VJ30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

2
pyasic/miners/types/whatsminer/M5X/M59.py
View File

@@ -24,7 +24,7 @@ class M59VH30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M59 VH30" self.model = "M59 VH30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M59 VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M59 VH30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

6
pyasic/miners/types/whatsminer/M6X/M60.py
View File

@@ -24,7 +24,7 @@ class M60VK10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M60 VK10" self.model = "M60 VK10"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M60 VK10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M60 VK10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -36,7 +36,7 @@ class M60VK20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M60 VK20" self.model = "M60 VK20"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M60 VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M60 VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -48,7 +48,7 @@ class M60VK30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M60 VK30" self.model = "M60 VK30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M60 VK30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M60 VK30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

10
pyasic/miners/types/whatsminer/M6X/M60S.py
View File

@@ -24,7 +24,7 @@ class M60SVK10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M60S VK10" self.model = "M60S VK10"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M60S VK10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M60S VK10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -36,7 +36,7 @@ class M60SVK20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M60S VK20" self.model = "M60S VK20"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M60S VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M60S VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -48,8 +48,8 @@ class M60SVK30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M60S VK30" self.model = "M60S VK30"
self.ideal_hashboards = 3 self.expected_hashboards = 3
self.nominal_chips = 78 self.expected_chips = 78
self.fan_count = 2 self.fan_count = 2
@@ -58,7 +58,7 @@ class M60SVK40(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M60S VK40" self.model = "M60S VK40"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M60S VK40, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M60S VK40, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

8
pyasic/miners/types/whatsminer/M6X/M63.py
View File

@@ -24,7 +24,7 @@ class M63VK10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M63 VK10" self.model = "M63 VK10"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M63 VK10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M63 VK10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -36,7 +36,7 @@ class M63VK20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M63 VK20" self.model = "M63 VK20"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M63 VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M63 VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -48,6 +48,6 @@ class M63VK30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M63 VK30" self.model = "M63 VK30"
self.nominal_chips = 68 self.expected_chips = 68
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.fan_count = 0 self.fan_count = 0

6
pyasic/miners/types/whatsminer/M6X/M63S.py
View File

@@ -24,7 +24,7 @@ class M63SVK10(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M63S VK10" self.model = "M63S VK10"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M63S VK10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M63S VK10, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -36,7 +36,7 @@ class M63SVK20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M63S VK20" self.model = "M63S VK20"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M63S VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M63S VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -48,7 +48,7 @@ class M63SVK30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M63S VK30" self.model = "M63S VK30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M63S VK30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M63S VK30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

4
pyasic/miners/types/whatsminer/M6X/M66.py
View File

@@ -24,7 +24,7 @@ class M66VK20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M66 VK20" self.model = "M66 VK20"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M66 VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M66 VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -36,7 +36,7 @@ class M66VK30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M66 VK30" self.model = "M66 VK30"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M66 VK30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M66 VK30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

8
pyasic/miners/types/whatsminer/M6X/M66S.py
View File

@@ -24,7 +24,7 @@ class M66SVK20(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M66S VK20" self.model = "M66S VK20"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M66S VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M66S VK20, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )
@@ -36,8 +36,8 @@ class M66SVK30(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M66S VK30" self.model = "M66S VK30"
self.nominal_chips = 96 self.expected_chips = 96
self.ideal_hashboards = 4 self.expected_hashboards = 4
self.fan_count = 0 self.fan_count = 0
@@ -46,7 +46,7 @@ class M66SVK40(WhatsMiner): # noqa - ignore ABC method implementation
super().__init__(ip, api_ver) super().__init__(ip, api_ver)
self.ip = ip self.ip = ip
self.model = "M66S VK40" self.model = "M66S VK40"
self.nominal_chips = 0 self.expected_chips = 0
warnings.warn( warnings.warn(
"Unknown chip count for miner type M66 VK30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)." "Unknown chip count for miner type M66 VK30, please open an issue on GitHub (https://github.com/UpstreamData/pyasic)."
) )

2
pyasic/miners/unknown.py
View File

@@ -145,7 +145,7 @@ class UnknownMiner(BaseMiner):
async def get_fault_light(self) -> bool: async def get_fault_light(self) -> bool:
return False return False
async def get_nominal_hashrate(self) -> Optional[float]: async def get_expected_hashrate(self) -> Optional[float]:
return None return None
async def is_mining(self, *args, **kwargs) -> Optional[bool]: async def is_mining(self, *args, **kwargs) -> Optional[bool]:

Some files were not shown because too many files have changed in this diff Show More