From 91d504fc1caabc18b39ae221211cbe9687ef5f1d Mon Sep 17 00:00:00 2001 From: John-Paul Compagnone Date: Tue, 14 May 2024 23:07:34 -0400 Subject: [PATCH 1/4] add Vopt status, fix typo --- pyasic/config/mining.py | 4 ++++ pyasic/miners/backends/epic.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pyasic/config/mining.py b/pyasic/config/mining.py index 77a6a1f6..a51847df 100644 --- a/pyasic/config/mining.py +++ b/pyasic/config/mining.py @@ -252,6 +252,7 @@ class MiningModeHashrateTune(MinerConfigValue): hashrate: int = None throttle_limit: int = None throttle_step: int = None + optimized: bool = False algo: TunerAlgo = field(default_factory=TunerAlgo.default) @classmethod @@ -263,6 +264,8 @@ class MiningModeHashrateTune(MinerConfigValue): cls_conf["throttle_limit"] = dict_conf["throttle_limit"] if dict_conf.get("throttle_step"): cls_conf["throttle_step"] = dict_conf["throttle_step"] + if dict_conf.get("optimized"): + cls_conf["optimized"] = dict_conf["optimized"] if dict_conf.get("algo"): cls_conf["algo"] = TunerAlgo.from_dict(dict_conf["algo"]) @@ -440,6 +443,7 @@ class MiningModeConfig(MinerConfigOption): throttle_step=algo_info["VoltageOptimizer"].get( "Throttle Step" ), + optimized=algo_info["VoltageOptimizer"].get("Optimized"), algo=TunerAlgo.voltage_optimizer(), ) else: diff --git a/pyasic/miners/backends/epic.py b/pyasic/miners/backends/epic.py index 79972749..94e6d800 100644 --- a/pyasic/miners/backends/epic.py +++ b/pyasic/miners/backends/epic.py @@ -315,7 +315,7 @@ class ePIC(BaseMiner): except APIError: pass - if web_capabilities is not None: + if web_capabilities is None: try: web_capabilities = await self.web.capabilities() except APIError: From afd8697f07b4e5124635e47153471a1175e5e239 Mon Sep 17 00:00:00 2001 From: John-Paul Compagnone Date: Wed, 15 May 2024 21:03:12 -0400 Subject: [PATCH 2/4] change from optimized to tuned, which is more generic for other FW --- pyasic/config/mining.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pyasic/config/mining.py b/pyasic/config/mining.py index a51847df..134ddf7e 100644 --- a/pyasic/config/mining.py +++ b/pyasic/config/mining.py @@ -252,7 +252,7 @@ class MiningModeHashrateTune(MinerConfigValue): hashrate: int = None throttle_limit: int = None throttle_step: int = None - optimized: bool = False + tuned: bool = False algo: TunerAlgo = field(default_factory=TunerAlgo.default) @classmethod @@ -264,8 +264,8 @@ class MiningModeHashrateTune(MinerConfigValue): cls_conf["throttle_limit"] = dict_conf["throttle_limit"] if dict_conf.get("throttle_step"): cls_conf["throttle_step"] = dict_conf["throttle_step"] - if dict_conf.get("optimized"): - cls_conf["optimized"] = dict_conf["optimized"] + if dict_conf.get("tuned"): + cls_conf["tuned"] = dict_conf["tuned"] if dict_conf.get("algo"): cls_conf["algo"] = TunerAlgo.from_dict(dict_conf["algo"]) @@ -443,12 +443,13 @@ class MiningModeConfig(MinerConfigOption): throttle_step=algo_info["VoltageOptimizer"].get( "Throttle Step" ), - optimized=algo_info["VoltageOptimizer"].get("Optimized"), + tuned=algo_info["VoltageOptimizer"].get("Optimized"), algo=TunerAlgo.voltage_optimizer(), ) else: return cls.hashrate_tuning( - hashrate=algo_info["ChipTune"]["Target"], + hashrate=algo_info["ChipTune"].get("Target"), + tuned=algo_info["ChipTune"].get("Optimized"), algo=TunerAlgo.chip_tune(), ) else: From d7f48d8f9faacd0bab45ed668474653a6fc6be6e Mon Sep 17 00:00:00 2001 From: John-Paul Compagnone Date: Thu, 16 May 2024 10:25:57 -0400 Subject: [PATCH 3/4] remove tuned from MinerConfig --- pyasic/config/mining.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pyasic/config/mining.py b/pyasic/config/mining.py index 134ddf7e..31ca7eb1 100644 --- a/pyasic/config/mining.py +++ b/pyasic/config/mining.py @@ -252,7 +252,6 @@ class MiningModeHashrateTune(MinerConfigValue): hashrate: int = None throttle_limit: int = None throttle_step: int = None - tuned: bool = False algo: TunerAlgo = field(default_factory=TunerAlgo.default) @classmethod @@ -264,8 +263,6 @@ class MiningModeHashrateTune(MinerConfigValue): cls_conf["throttle_limit"] = dict_conf["throttle_limit"] if dict_conf.get("throttle_step"): cls_conf["throttle_step"] = dict_conf["throttle_step"] - if dict_conf.get("tuned"): - cls_conf["tuned"] = dict_conf["tuned"] if dict_conf.get("algo"): cls_conf["algo"] = TunerAlgo.from_dict(dict_conf["algo"]) @@ -443,13 +440,11 @@ class MiningModeConfig(MinerConfigOption): throttle_step=algo_info["VoltageOptimizer"].get( "Throttle Step" ), - tuned=algo_info["VoltageOptimizer"].get("Optimized"), algo=TunerAlgo.voltage_optimizer(), ) else: return cls.hashrate_tuning( hashrate=algo_info["ChipTune"].get("Target"), - tuned=algo_info["ChipTune"].get("Optimized"), algo=TunerAlgo.chip_tune(), ) else: From c26b78aa014666ed2cf60123dbaf254b5719a23e Mon Sep 17 00:00:00 2001 From: Upstream Data Date: Thu, 16 May 2024 08:27:38 -0600 Subject: [PATCH 4/4] version: bump version number. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9c447457..12a5c3e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyasic" -version = "0.57.0" +version = "0.57.1" description = "A simplified and standardized interface for Bitcoin ASICs." authors = ["UpstreamData "] repository = "https://github.com/UpstreamData/pyasic"