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

fix: change sticker hashrate to GH for Hammer and VolcMiner (#264)

Browse Source 
* change sticker hashrate to GH

* clean up hashrate for Hammer/Volcminer

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
JP Compagnone
2025-01-02 00:38:57 -05:00
committed by GitHub
parent 23890fa10a
commit 748279c25d
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pyasic/miners/backends/hammer.py
View File

@@ -173,8 +173,8 @@ class BlackMiner(StockFirmware):
if rpc_summary is not None: if rpc_summary is not None:
try: try:
return self.algo.hashrate( return self.algo.hashrate(
rate=float(rpc_summary["SUMMARY"][0]["GHS 5s"]), rate=float(rpc_summary["SUMMARY"][0]["MHS 5s"]),
unit=self.algo.unit.GH, unit=self.algo.unit.MH,
).into(self.algo.unit.default) ).into(self.algo.unit.default)
except (LookupError, ValueError, TypeError): except (LookupError, ValueError, TypeError):
pass pass
@@ -229,7 +229,7 @@ class BlackMiner(StockFirmware):
hashrate = boards[1].get(f"chain_rate{i}") hashrate = boards[1].get(f"chain_rate{i}")
if hashrate: if hashrate:
hashboard.hashrate = self.algo.hashrate( hashboard.hashrate = self.algo.hashrate(
rate=float(hashrate), unit=self.algo.unit.GH rate=float(hashrate), unit=self.algo.unit.MH
).into(self.algo.unit.default) ).into(self.algo.unit.default)
chips = boards[1].get(f"chain_acn{i}") chips = boards[1].get(f"chain_acn{i}")
@@ -358,7 +358,7 @@ class BlackMiner(StockFirmware):
try: try:
expected_rate = rpc_stats["STATS"][1].get("total_rateideal") expected_rate = rpc_stats["STATS"][1].get("total_rateideal")
if expected_rate is None: if expected_rate is None:
expected_rate = self.sticker_hashrate return self.sticker_hashrate
try: try:
rate_unit = rpc_stats["STATS"][1]["rate_unit"] rate_unit = rpc_stats["STATS"][1]["rate_unit"]
except KeyError: except KeyError:

4
pyasic/miners/hammer/blackminer/DX/D10.py
View File

@@ -1,6 +1,8 @@
from pyasic.device.algorithm.hashrate.unit.scrypt import ScryptUnit
from pyasic.device.algorithm.scrypt import ScryptHashRate
from pyasic.miners.backends import BlackMiner from pyasic.miners.backends import BlackMiner
from pyasic.miners.device.models import D10 from pyasic.miners.device.models import D10
class HammerD10(BlackMiner, D10): class HammerD10(BlackMiner, D10):
sticker_hashrate = 5000 sticker_hashrate = ScryptHashRate(rate=5.0, unit=ScryptUnit.GH)

4
pyasic/miners/volcminer/blackminer/DX/D1.py
View File

@@ -1,6 +1,8 @@
from pyasic.device.algorithm.hashrate.unit.scrypt import ScryptUnit
from pyasic.device.algorithm.scrypt import ScryptHashRate
from pyasic.miners.backends import BlackMiner from pyasic.miners.backends import BlackMiner
from pyasic.miners.device.models import D1 from pyasic.miners.device.models import D1
class VolcMinerD1(BlackMiner, D1): class VolcMinerD1(BlackMiner, D1):
sticker_hashrate = 15150 sticker_hashrate = ScryptHashRate(rate=15.15, unit=ScryptUnit.GH)