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

feature: add support for E9Pro and fix some bugs and update finding chip data for Goldshell models.

Browse Source
This commit is contained in:
Upstream Data
2023-03-04 16:13:03 -07:00
parent e3c4464556
commit 848acedd52
32 changed files with 438 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pyasic/miners/ckb/_backends/goldshell.py
View File

@@ -75,7 +75,7 @@ class Goldshell(BFGMiner):
except KeyError:
pass
async def get_hashboards(self, api_devs: dict = None) -> List[HashBoard]:
async def get_hashboards(self, api_devs: dict = None, api_devdetails: dict = None) -> List[HashBoard]:
if not api_devs:
try:
api_devs = await self.api.devs()
@@ -89,7 +89,7 @@ class Goldshell(BFGMiner):
if api_devs:
for board in api_devs["DEVS"]:
if board.get("ID"):
if board.get("ID") is not None:
try:
b_id = board["ID"]
hashboards[b_id].hashrate = round(board["MHS 20s"] / 1000000, 2)
@@ -98,4 +98,19 @@ class Goldshell(BFGMiner):
except KeyError:
pass
if not api_devdetails:
try:
api_devdetails = await self.api.devdetails()
except APIError:
pass
if api_devdetails:
for board in api_devdetails["DEVS"]:
if board.get("ID") is not None:
try:
b_id = board["ID"]
hashboards[b_id].chips = board["chips-nr"]
except KeyError:
pass
return hashboards

2
pyasic/miners/ckb/_types/goldshell/CK5.py
View File

@@ -22,5 +22,5 @@ class CK5(GoldshellMiner): # noqa - ignore ABC method implementation
self.ip = ip
self.model = "CK5"
self.ideal_hashboards = 4
self.chip_count = 18
self.nominal_chips = 46
self.fan_count = 4

6
pyasic/miners/dcr/_backends/X5.py
View File

@@ -20,14 +20,14 @@ from pyasic.config import MinerConfig
from pyasic.data import Fan, HashBoard
from pyasic.errors import APIError
from pyasic.miners.zec._backends import CGMiner # noqa - Ignore access to _module
from pyasic.web.X5 import X5WebAPI
from pyasic.web.X17 import X17WebAPI
class X5(CGMiner):
def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
super().__init__(ip, api_ver=api_ver)
self.ip = ip
self.web = X5WebAPI(ip)
self.web = X17WebAPI(ip)
async def get_config(self) -> MinerConfig:
data = await self.web.get_miner_conf()
@@ -36,7 +36,7 @@ class X5(CGMiner):
return self.config
async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
await self.web.set_miner_conf(config.as_x5(user_suffix=user_suffix))
await self.web.set_miner_conf(config.as_x17(user_suffix=user_suffix))
async def get_mac(self) -> Union[str, None]:
try:

1
pyasic/miners/etc/__init__.py
View File

@@ -14,3 +14,4 @@
# limitations under the License. -
# ------------------------------------------------------------------------------
from .innosilicon import *
from .antminer import *

205
pyasic/miners/etc/_backends/X9.py Normal file
View File

@@ -0,0 +1,205 @@
# ------------------------------------------------------------------------------
# Copyright 2022 Upstream Data Inc -
# -
# Licensed under the Apache License, Version 2.0 (the "License"); -
# you may not use this file except in compliance with the License. -
# You may obtain a copy of the License at -
# -
# http://www.apache.org/licenses/LICENSE-2.0 -
# -
# Unless required by applicable law or agreed to in writing, software -
# distributed under the License is distributed on an "AS IS" BASIS, -
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from typing import List, Optional, Union
from pyasic.config import MinerConfig
from pyasic.data import Fan, HashBoard
from pyasic.errors import APIError
from pyasic.miners.etc._backends import CGMiner # noqa - Ignore access to _module
from pyasic.web.X19 import X19WebAPI
class X9(CGMiner):
def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
super().__init__(ip, api_ver=api_ver)
self.ip = ip
self.web = X19WebAPI(ip)
async def get_config(self) -> MinerConfig:
data = await self.web.get_miner_conf()
if data:
self.config = MinerConfig().from_raw(data)
return self.config
async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
await self.web.set_miner_conf(config.as_x19(user_suffix=user_suffix))
async def get_mac(self) -> Union[str, None]:
try:
data = await self.web.get_system_info()
if data:
return data["macaddr"]
except KeyError:
pass
async def restart_backend(self) -> bool:
return False
async def fault_light_on(self) -> bool:
# this should time out, after it does do a check
await self.web.blink(blink=True)
try:
data = await self.web.get_blink_status()
if data:
if data["isBlinking"]:
self.light = True
except KeyError:
pass
return self.light
async def fault_light_off(self) -> bool:
await self.web.blink(blink=False)
try:
data = await self.web.get_blink_status()
if data:
if not data["isBlinking"]:
self.light = False
except KeyError:
pass
return self.light
async def reboot(self) -> bool:
data = await self.web.reboot()
if data:
return True
return False
async def get_fault_light(self, web_get_blink_status: dict = None) -> bool:
if self.light:
return self.light
if not web_get_blink_status:
try:
web_get_blink_status = await self.web.get_blink_status()
except APIError:
pass
if web_get_blink_status:
try:
self.light = web_get_blink_status["isBlinking"]
except KeyError:
pass
return self.light
async def get_hostname(self, web_get_system_info: dict = None) -> Optional[str]:
if not web_get_system_info:
try:
web_get_system_info = await self.web.get_system_info()
except APIError:
pass
if web_get_system_info:
try:
return web_get_system_info["hostname"]
except KeyError:
pass
async def get_model(self, web_get_system_info: dict = None) -> Optional[str]:
if self.model:
return self.model
if not web_get_system_info:
try:
web_get_system_info = await self.web.get_system_info()
except APIError:
pass
if web_get_system_info:
try:
return web_get_system_info["minertype"]
except APIError:
pass
async def get_fans(self, api_stats: dict = None) -> List[Fan]:
if not api_stats:
try:
api_stats = await self.api.stats()
except APIError:
pass
fans_data = [Fan(), Fan(), Fan(), Fan()]
if api_stats:
try:
fan_offset = -1
for fan_num in range(1, 8, 4):
for _f_num in range(4):
f = api_stats["STATS"][1].get(f"fan{fan_num + _f_num}")
if f and not f == 0 and fan_offset == -1:
fan_offset = fan_num + 2
if fan_offset == -1:
fan_offset = 3
for fan in range(self.fan_count):
fans_data[fan] = Fan(
api_stats["STATS"][1].get(f"fan{fan_offset+fan}")
)
except (KeyError, IndexError):
pass
return fans_data
async def get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
hashboards = []
if not api_stats:
try:
api_stats = await self.api.stats()
except APIError:
pass
if api_stats:
try:
board_offset = -1
boards = api_stats["STATS"]
if len(boards) > 1:
for board_num in range(1, 16, 5):
for _b_num in range(5):
b = boards[1].get(f"chain_acn{board_num + _b_num}")
if b and not b == 0 and board_offset == -1:
board_offset = board_num
if board_offset == -1:
board_offset = 1
for i in range(board_offset, board_offset + self.ideal_hashboards):
hashboard = HashBoard(
slot=i - board_offset, expected_chips=self.nominal_chips
)
chip_temp = boards[1].get(f"temp{i}")
if chip_temp:
hashboard.chip_temp = round(chip_temp)
temp = boards[1].get(f"temp2_{i}")
if temp:
hashboard.temp = round(temp)
hashrate = boards[1].get(f"chain_rate{i}")
if hashrate:
hashboard.hashrate = round(float(hashrate) / 1000, 2)
chips = boards[1].get(f"chain_acn{i}")
if chips:
hashboard.chips = chips
hashboard.missing = False
if (not chips) or (not chips > 0):
hashboard.missing = True
hashboards.append(hashboard)
except (IndexError, KeyError, ValueError, TypeError):
pass
return hashboards

2
pyasic/miners/etc/_backends/__init__.py
View File

@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from .cgminer import CGMiner
from .X9 import X9

2
pyasic/miners/etc/_types/__init__.py
View File

@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from .innosilicon import *
from .antminer import *

27
pyasic/miners/etc/_types/antminer/X9/E9_Pro.py Normal file
View File

@@ -0,0 +1,27 @@
# ------------------------------------------------------------------------------
# Copyright 2022 Upstream Data Inc -
# -
# Licensed under the Apache License, Version 2.0 (the "License"); -
# you may not use this file except in compliance with the License. -
# You may obtain a copy of the License at -
# -
# http://www.apache.org/licenses/LICENSE-2.0 -
# -
# Unless required by applicable law or agreed to in writing, software -
# distributed under the License is distributed on an "AS IS" BASIS, -
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from pyasic.miners.makes import AntMiner
class E9Pro(AntMiner): # noqa - ignore ABC method implementation
def __init__(self, ip: str):
super().__init__()
self.ip = ip
self.model = "E9Pro"
self.nominal_chips = 8
self.ideal_hashboards = 2
self.fan_count = 4

16
pyasic/miners/etc/_types/antminer/X9/__init__.py Normal file
View File

@@ -0,0 +1,16 @@
# ------------------------------------------------------------------------------
# Copyright 2022 Upstream Data Inc -
# -
# Licensed under the Apache License, Version 2.0 (the "License"); -
# you may not use this file except in compliance with the License. -
# You may obtain a copy of the License at -
# -
# http://www.apache.org/licenses/LICENSE-2.0 -
# -
# Unless required by applicable law or agreed to in writing, software -
# distributed under the License is distributed on an "AS IS" BASIS, -
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from .E9_Pro import E9Pro

16
pyasic/miners/etc/_types/antminer/__init__.py Normal file
View File

@@ -0,0 +1,16 @@
# ------------------------------------------------------------------------------
# Copyright 2022 Upstream Data Inc -
# -
# Licensed under the Apache License, Version 2.0 (the "License"); -
# you may not use this file except in compliance with the License. -
# You may obtain a copy of the License at -
# -
# http://www.apache.org/licenses/LICENSE-2.0 -
# -
# Unless required by applicable law or agreed to in writing, software -
# distributed under the License is distributed on an "AS IS" BASIS, -
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from .X9 import *

16
pyasic/miners/etc/antminer/__init__.py Normal file
View File

@@ -0,0 +1,16 @@
# ------------------------------------------------------------------------------
# Copyright 2022 Upstream Data Inc -
# -
# Licensed under the Apache License, Version 2.0 (the "License"); -
# you may not use this file except in compliance with the License. -
# You may obtain a copy of the License at -
# -
# http://www.apache.org/licenses/LICENSE-2.0 -
# -
# Unless required by applicable law or agreed to in writing, software -
# distributed under the License is distributed on an "AS IS" BASIS, -
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from .cgminer import *

21
pyasic/miners/etc/antminer/cgminer/X9/E9_Pro.py Normal file
View File

@@ -0,0 +1,21 @@
# ------------------------------------------------------------------------------
# Copyright 2022 Upstream Data Inc -
# -
# Licensed under the Apache License, Version 2.0 (the "License"); -
# you may not use this file except in compliance with the License. -
# You may obtain a copy of the License at -
# -
# http://www.apache.org/licenses/LICENSE-2.0 -
# -
# Unless required by applicable law or agreed to in writing, software -
# distributed under the License is distributed on an "AS IS" BASIS, -
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from pyasic.miners.etc._backends import X9 # noqa - Ignore access to _module
from pyasic.miners.etc._types import E9Pro # noqa - Ignore access to _module
class CGMinerE9Pro(X9, E9Pro):
pass

16
pyasic/miners/etc/antminer/cgminer/X9/__init__.py Normal file
View File

@@ -0,0 +1,16 @@
# ------------------------------------------------------------------------------
# Copyright 2022 Upstream Data Inc -
# -
# Licensed under the Apache License, Version 2.0 (the "License"); -
# you may not use this file except in compliance with the License. -
# You may obtain a copy of the License at -
# -
# http://www.apache.org/licenses/LICENSE-2.0 -
# -
# Unless required by applicable law or agreed to in writing, software -
# distributed under the License is distributed on an "AS IS" BASIS, -
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from .E9_Pro import CGMinerE9Pro

16
pyasic/miners/etc/antminer/cgminer/__init__.py Normal file
View File

@@ -0,0 +1,16 @@
# ------------------------------------------------------------------------------
# Copyright 2022 Upstream Data Inc -
# -
# Licensed under the Apache License, Version 2.0 (the "License"); -
# you may not use this file except in compliance with the License. -
# You may obtain a copy of the License at -
# -
# http://www.apache.org/licenses/LICENSE-2.0 -
# -
# Unless required by applicable law or agreed to in writing, software -
# distributed under the License is distributed on an "AS IS" BASIS, -
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -
# See the License for the specific language governing permissions and -
# limitations under the License. -
# ------------------------------------------------------------------------------
from .X9 import *

6
pyasic/miners/hns/_backends/X3.py
View File

@@ -20,14 +20,14 @@ from pyasic.config import MinerConfig
from pyasic.data import Fan, HashBoard
from pyasic.errors import APIError
from pyasic.miners.hns._backends import CGMiner # noqa - Ignore access to _module
from pyasic.web.X3 import X3WebAPI
from pyasic.web.X19 import X19WebAPI
class X3(CGMiner):
def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
super().__init__(ip, api_ver=api_ver)
self.ip = ip
self.web = X3WebAPI(ip)
self.web = X19WebAPI(ip)
async def get_config(self) -> MinerConfig:
data = await self.web.get_miner_conf()
@@ -36,7 +36,7 @@ class X3(CGMiner):
return self.config
async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
await self.web.set_miner_conf(config.as_x5(user_suffix=user_suffix))
await self.web.set_miner_conf(config.as_x19(user_suffix=user_suffix))
async def get_mac(self) -> Union[str, None]:
try:

19
pyasic/miners/hns/_backends/goldshell.py
View File

@@ -76,7 +76,7 @@ class Goldshell(BFGMiner):
except KeyError:
pass
async def get_hashboards(self, api_devs: dict = None) -> List[HashBoard]:
async def get_hashboards(self, api_devs: dict = None, api_devdetails: dict = None) -> List[HashBoard]:
if not api_devs:
try:
api_devs = await self.api.devs()
@@ -90,7 +90,7 @@ class Goldshell(BFGMiner):
if api_devs:
for board in api_devs["DEVS"]:
if board.get("ID"):
if board.get("ID") is not None:
try:
b_id = board["ID"]
hashboards[b_id].hashrate = round(board["MHS 20s"] / 1000000, 2)
@@ -99,4 +99,19 @@ class Goldshell(BFGMiner):
except KeyError:
pass
if not api_devdetails:
try:
api_devdetails = await self.api.devdetails()
except APIError:
pass
if api_devdetails:
for board in api_devdetails["DEVS"]:
if board.get("ID") is not None:
try:
b_id = board["ID"]
hashboards[b_id].chips = board["chips-nr"]
except KeyError:
pass
return hashboards

2
pyasic/miners/hns/_types/antminer/X3/HS3.py
View File

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

2
pyasic/miners/hns/_types/goldshell/HS5.py
View File

@@ -22,5 +22,5 @@ class HS5(GoldshellMiner): # noqa - ignore ABC method implementation
self.ip = ip
self.model = "HS5"
self.ideal_hashboards = 4
self.chip_count = 18
self.nominal_chips = 46
self.fan_count = 4

19
pyasic/miners/kda/_backends/goldshell.py
View File

@@ -76,7 +76,7 @@ class Goldshell(BFGMiner):
except KeyError:
pass
async def get_hashboards(self, api_devs: dict = None) -> List[HashBoard]:
async def get_hashboards(self, api_devs: dict = None, api_devdetails: dict = None) -> List[HashBoard]:
if not api_devs:
try:
api_devs = await self.api.devs()
@@ -90,7 +90,7 @@ class Goldshell(BFGMiner):
if api_devs:
for board in api_devs["DEVS"]:
if board.get("ID"):
if board.get("ID") is not None:
try:
b_id = board["ID"]
hashboards[b_id].hashrate = round(board["MHS 20s"] / 1000000, 2)
@@ -99,4 +99,19 @@ class Goldshell(BFGMiner):
except KeyError:
pass
if not api_devdetails:
try:
api_devdetails = await self.api.devdetails()
except APIError:
pass
if api_devdetails:
for board in api_devdetails["DEVS"]:
if board.get("ID") is not None:
try:
b_id = board["ID"]
hashboards[b_id].chips = board["chips-nr"]
except KeyError:
pass
return hashboards

2
pyasic/miners/kda/_types/goldshell/KD5.py
View File

@@ -22,5 +22,5 @@ class KD5(GoldshellMiner): # noqa - ignore ABC method implementation
self.ip = ip
self.model = "KD5"
self.ideal_hashboards = 4
self.chip_count = 18
self.nominal_chips = 46
self.fan_count = 4

4
pyasic/miners/kda/_types/goldshell/KDMax.py
View File

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

4
pyasic/miners/ltc/_backends/X7.py
View File

@@ -22,14 +22,14 @@ from pyasic.config import MinerConfig, X19PowerMode
from pyasic.data import HashBoard
from pyasic.data.error_codes import MinerErrorData, X19Error
from pyasic.miners.btc._backends import BMMiner # noqa - Ignore access to _module
from pyasic.web.X7 import X7WebAPI
from pyasic.web.X19 import X19WebAPI
class X7(BMMiner):
def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
super().__init__(ip, api_ver=api_ver)
self.ip = ip
self.web = X7WebAPI(ip)
self.web = X19WebAPI(ip)
async def get_config(self) -> MinerConfig:
data = await self.web.get_miner_conf()

4
pyasic/miners/miner_factory.py
View File

@@ -58,6 +58,10 @@ MINER_CLASSES = {
"Default": BMMinerL7,
"BMMiner": BMMinerL7,
},
"ANTMINER E9 PRO": {
"Default": CGMinerE9Pro,
"BMMiner": CGMinerE9Pro,
},
"ANTMINER S9": {
"Default": BOSMinerS9,
"BOSMiner": BOSMinerOld,

6
pyasic/miners/zec/_backends/X15.py
View File

@@ -20,14 +20,14 @@ from pyasic.config import MinerConfig
from pyasic.data import Fan, HashBoard
from pyasic.errors import APIError
from pyasic.miners.zec._backends import CGMiner # noqa - Ignore access to _module
from pyasic.web.X15 import X15WebAPI
from pyasic.web.X17 import X17WebAPI
class X15(CGMiner):
def __init__(self, ip: str, api_ver: str = "0.0.0") -> None:
super().__init__(ip, api_ver=api_ver)
self.ip = ip
self.web = X15WebAPI(ip)
self.web = X17WebAPI(ip)
async def get_config(self) -> MinerConfig:
data = await self.web.get_miner_conf()
@@ -36,7 +36,7 @@ class X15(CGMiner):
return self.config
async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
await self.web.set_miner_conf(config.as_x15(user_suffix=user_suffix))
await self.web.set_miner_conf(config.as_x17(user_suffix=user_suffix))
async def get_mac(self) -> Union[str, None]:
try: