From 568ffd67c42c79776f503a27445fff89d2e85b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=B8rge=20Holm-Wennberg?= Date: Mon, 29 Jul 2024 09:47:19 +0200 Subject: [PATCH 1/3] Add custom auth to Digest of AntMiner model check --- pyasic/miners/factory.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyasic/miners/factory.py b/pyasic/miners/factory.py index bff39771..f76a84f1 100644 --- a/pyasic/miners/factory.py +++ b/pyasic/miners/factory.py @@ -833,7 +833,9 @@ class MinerFactory: async def _get_model_antminer_web(self, ip: str) -> str | None: # last resort, this is slow - auth = httpx.DigestAuth("root", "root") + auth = httpx.DigestAuth( + "root", settings.get("default_antminer_password", "root") + ) web_json_data = await self.send_web_command( ip, "/cgi-bin/get_system_info.cgi", auth=auth ) From 8ec88e385a877a6b26fdf523f424525a116f5eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=B8rge=20Holm-Wennberg?= Date: Mon, 29 Jul 2024 10:41:20 +0200 Subject: [PATCH 2/3] Remove leftover print of config --- pyasic/miners/backends/braiins_os.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pyasic/miners/backends/braiins_os.py b/pyasic/miners/backends/braiins_os.py index fbbdba37..c41905fd 100644 --- a/pyasic/miners/backends/braiins_os.py +++ b/pyasic/miners/backends/braiins_os.py @@ -189,7 +189,6 @@ class BOSMiner(BraiinsOSFirmware): async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None: self.config = config - print(config) parsed_cfg = config.as_bosminer(user_suffix=user_suffix) toml_conf = toml.dumps( From 00cf1449f9c89d96723d853ccfdfeba0a6351cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=B8rge=20Holm-Wennberg?= Date: Mon, 29 Jul 2024 10:45:22 +0200 Subject: [PATCH 3/3] docs for settings mismatches --- README.md | 2 +- docs/index.md | 2 +- docs/settings/settings.md | 3 ++- pyasic/miners/factory.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bb73d7de..b8f25011 100644 --- a/README.md +++ b/README.md @@ -255,7 +255,7 @@ if __name__ == "__main__": ```python from pyasic import settings -settings.update("default_antminer_password", "my_pwd") +settings.update("default_antminer_web_password", "my_pwd") ``` ##### Default values: diff --git a/docs/index.md b/docs/index.md index f94e711d..37985ec8 100644 --- a/docs/index.md +++ b/docs/index.md @@ -249,7 +249,7 @@ if __name__ == "__main__": ```python from pyasic import settings -settings.update("default_antminer_password", "my_pwd") +settings.update("default_antminer_web_password", "my_pwd") ``` ##### Default values: diff --git a/docs/settings/settings.md b/docs/settings/settings.md index bf58552c..cc0456de 100644 --- a/docs/settings/settings.md +++ b/docs/settings/settings.md @@ -15,7 +15,8 @@ Settings options: - `antminer_mining_mode_as_str` - `default_whatsminer_password` - `default_innosilicon_password` -- `default_antminer_password` +- `default_antminer_web_password` +- `default_antminer_ssh_password` - `default_bosminer_password` - `default_vnish_password` - `default_goldshell_password` diff --git a/pyasic/miners/factory.py b/pyasic/miners/factory.py index f76a84f1..dc852455 100644 --- a/pyasic/miners/factory.py +++ b/pyasic/miners/factory.py @@ -834,7 +834,7 @@ class MinerFactory: async def _get_model_antminer_web(self, ip: str) -> str | None: # last resort, this is slow auth = httpx.DigestAuth( - "root", settings.get("default_antminer_password", "root") + "root", settings.get("default_antminer_web_password", "root") ) web_json_data = await self.send_web_command( ip, "/cgi-bin/get_system_info.cgi", auth=auth