default client passwd to None

Author: MatthewWertman

src/ipr.py

@@ -978,8 +978,8 @@ def populate_id_table(self) -> None:
     def get_target_data_from_type(self) -> Dict[str, str]:
         ip = self.result["ip"]
         type = self.result["type"]
-        client_auth = ""
-        custom_auth = ""
+        client_auth = None
+        custom_auth = None
         match type:
             case "antminer":
                 client_auth = self.lineBitmainPasswd.text()

src/mod/api/client.py

@@ -43,65 +43,65 @@ def get_client(self):
         return self.client
 
     def create_bitmain_client(
-        self, ip_addr: str, passwd: str, vnish_passwd: str
+        self, ip_addr: str, passwd: Optional[str] = None, vnish_passwd: Optional[str] = None
     ) -> None:
         try:
             self.client = BitmainHTTPClient(ip_addr, passwd, vnish_passwd)
         except (FailedConnectionError, AuthenticationError) as err:
             logger.error(err)
 
     def create_iceriver_client(
-        self, ip_addr: str, passwd: Optional[str], pb_key: str
+        self, ip_addr: str, passwd: Optional[str] = None, pb_key: Optional[str] = None
     ) -> None:
         try:
             self.client = IceriverHTTPClient(ip_addr, passwd, pb_key)
         except FailedConnectionError as err:
             logger.error(err)
 
-    def create_whatsminer_client(self, ip_addr: str, passwd: str) -> None:
+    def create_whatsminer_client(self, ip_addr: str, passwd: Optional[str] = None) -> None:
         try:
             self.client = WhatsminerRPCClient(ip_addr, passwd)
         except FailedConnectionError as err:
             logger.error(err)
 
-    def create_whatsminerv3_client(self, ip_addr: str, user: Optional[str], passwd: Optional[str]) -> None:
+    def create_whatsminerv3_client(self, ip_addr: str, user: Optional[str] = None, passwd: Optional[str] = None) -> None:
         try:
             self.client = WhatsminerV3Client(ip_addr, user, passwd)
         except FailedConnectionError as err:
             logger.error(err)
 
-    def create_volcminer_client(self, ip_addr: str, passwd: str) -> None:
+    def create_volcminer_client(self, ip_addr: str, passwd: Optional[str] = None) -> None:
         try:
             self.client = VolcminerHTTPClient(ip_addr, passwd)
         except (FailedConnectionError, AuthenticationError) as err:
             logger.error(err)
 
-    def create_goldshell_client(self, ip_addr: str, passwd: str) -> None:
+    def create_goldshell_client(self, ip_addr: str, passwd: Optional[str] = None) -> None:
         try:
             self.client = GoldshellHTTPClient(ip_addr, passwd)
         except (FailedConnectionError, AuthenticationError) as err:
             logger.error(err)
 
-    def create_sealminer_client(self, ip_addr: str, passwd: str) -> None:
+    def create_sealminer_client(self, ip_addr: str, passwd: Optional[str] = None) -> None:
         try:
             self.client = SealminerHTTPClient(ip_addr, passwd)
         except (FailedConnectionError, AuthenticationError) as err:
             logger.error(err)
 
-    def create_elphapex_client(self, ip_addr: str, passwd: Optional[str]) -> None:
+    def create_elphapex_client(self, ip_addr: str, passwd: Optional[str] = None) -> None:
         try:
             self.client = ElphapexHTTPClient(ip_addr, passwd)
         except (FailedConnectionError, AuthenticationError) as err:
             logger.error(err)
 
-    def create_dragonball_client(self, ip_addr: str, passwd: Optional[str]) -> None:
+    def create_dragonball_client(self, ip_addr: str, passwd: Optional[str] = None) -> None:
         try:
             self.client = DragonballHTTPClient(ip_addr, passwd)
         except (FailedConnectionError, AuthenticationError) as err:
             logger.error(err)
 
     def create_client_from_type(
-        self, miner_type: str, ip_addr: str, auth: str, custom_auth: str
+        self, miner_type: str, ip_addr: str, auth: Optional[str] =  None, custom_auth: Optional[str] = None
     ) -> None:
         match miner_type:
             case "antminer":

src/mod/api/miners/bitmain/client.py

@@ -15,7 +15,7 @@
 class BitmainHTTPClient(BaseHTTPClient):
     """Bitmain/Antminer HTTP Client with support for vnish"""
 
-    def __init__(self, ip_addr: str, passwd: str, vnish_passwd: str):
+    def __init__(self, ip_addr: str, passwd: Optional[str], vnish_passwd: Optional[str]):
         super().__init__(ip_addr)
         self.url = f"http://{self.ip}:{self.port}/"
         self.username = "root"

src/mod/api/miners/goldshell/client.py

@@ -14,7 +14,7 @@
 class GoldshellHTTPClient(BaseHTTPClient):
     """Goldshell HTTP Client"""
 
-    def __init__(self, ip_addr: str, passwd: str):
+    def __init__(self, ip_addr: str, passwd: Optional[str]):
         super().__init__(ip_addr)
         self.url = f"http://{self.ip}:{self.port}/"
         self.username = "admin"
@@ -110,5 +110,5 @@ def encrypt_to_hex(plain: str) -> str:
         AES.MODE_CBC,
         iv=bytes([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
     )
-    b = zero_pad(plain.encode("UTF-8"), 16)
+    b = zero_pad(plain.encode(), 16)
     return cipher.encrypt(b).hex()

src/mod/api/miners/sealminer/client.py

@@ -11,7 +11,7 @@
 class SealminerHTTPClient(BaseHTTPClient):
     """Bitdeer/Sealminer HTTP Client"""
 
-    def __init__(self, ip_addr: str, passwd: str):
+    def __init__(self, ip_addr: str, passwd: Optional[str]):
         super().__init__(ip_addr)
         self.url = f"http://{self.ip}:{self.port}/"
         self.username = "seal"

src/mod/api/miners/volcminer/client.py

@@ -12,7 +12,7 @@
 class VolcminerHTTPClient(BaseHTTPClient):
     """Volcminer HTTP Client"""
 
-    def __init__(self, ip_addr: str, passwd: str):
+    def __init__(self, ip_addr: str, passwd: Optional[str]):
         super().__init__(ip_addr)
         self.url = f"http://{self.ip}:{self.port}/"
         self.username = "root"

src/mod/api/miners/whatsminer/client.py

@@ -9,6 +9,7 @@
 
 from Crypto.Cipher import AES
 from passlib.hash import md5_crypt
+from scapy.arch.solaris import Optional
 
 from mod.api import settings
 from mod.api.rpc import BaseRPCClient
@@ -67,7 +68,7 @@ def parse_privileged_data(token: Dict[str, Any], data: dict) -> dict:
 class WhatsminerRPCClient(BaseRPCClient):
     """Whatsminer JSON-RPC API V2 client"""
 
-    def __init__(self, ip_addr: str, passwd: str):
+    def __init__(self, ip_addr: str, passwd: Optional[str]):
         super().__init__(ip_addr)
         self.passwds: List[str] = [passwd, settings.get("default_whatsminer_passwd")]
         self.token = None