mm-web3 0.5.7__py3-none-any.whl → 0.6.0__py3-none-any.whl

mm_web3/calcs.py

@@ -120,6 +120,8 @@ def calc_expression_with_vars(
                 term_value = int(term)
             elif suffix is not None:
                 term_value = convert_value_with_units(term, unit_decimals)
+            elif term.startswith("random(") and term.endswith(")"):
+                term_value = _parse_random_function(term, unit_decimals)
             elif variables:
                 # Check if term ends with any variable name
                 matched_var = None
@@ -132,21 +134,19 @@ def calc_expression_with_vars(
                     multiplier_part = term.removesuffix(matched_var)
                     multiplier = Decimal(multiplier_part) if multiplier_part else Decimal(1)
                     term_value = int(multiplier * variables[matched_var])
-                # Check for random function
-                elif term.startswith("random(") and term.endswith(")"):
-                    term_value = _parse_random_function(term, unit_decimals)
                 else:
+                    # Re-raise as ValueError for consistent error type from function
                     raise ValueError(f"unrecognized term: {term}")  # noqa: TRY301
-            elif term.startswith("random(") and term.endswith(")"):
-                term_value = _parse_random_function(term, unit_decimals)
             else:
+                # Re-raise as ValueError for consistent error type from function
                 raise ValueError(f"unrecognized term: {term}")  # noqa: TRY301
 
             if operator == "+":
                 result += term_value
-            if operator == "-":
+            elif operator == "-":
                 result -= term_value
 
+        # Return inside try is intentional - exception handling wraps entire calculation
         return result  # noqa: TRY300
     except Exception as e:
         raise ValueError(e) from e

mm_web3/config.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Any, NoReturn, Self, TypeVar
 from zipfile import ZipFile
 
-import mm_print
+from mm_print import print_json, print_plain
 from mm_result import Result
 from pydantic import BaseModel, ConfigDict, ValidationError
 
@@ -31,11 +31,11 @@ class Web3CliConfig(BaseModel):
         if count:
             for k in count:
                 data[k] = len(data[k])
-        mm_print.json(data)
+        print_json(data)
         sys.exit(0)
 
     @classmethod
-    def read_toml_config_or_exit(cls, config_path: Path, zip_password: str = "") -> Self:  # nosec
+    def read_toml_config_or_exit(cls, config_path: Path, zip_password: str = "") -> Self:  # nosec: empty default is for optional password, not hardcoded secret
         """Read TOML config file, exit on error.
 
         Args:
@@ -51,7 +51,7 @@ class Web3CliConfig(BaseModel):
         cls._print_error_and_exit(res)
 
     @classmethod
-    async def read_toml_config_or_exit_async(cls, config_path: Path, zip_password: str = "") -> Self:  # nosec
+    async def read_toml_config_or_exit_async(cls, config_path: Path, zip_password: str = "") -> Self:  # nosec: empty default is for optional password, not hardcoded secret
         """Read TOML config file with async validation, exit on error.
 
         Args:
@@ -67,7 +67,7 @@ class Web3CliConfig(BaseModel):
         cls._print_error_and_exit(res)
 
     @classmethod
-    def _load_toml_data(cls, config_path: Path, zip_password: str = "") -> dict[str, Any]:  # nosec
+    def _load_toml_data(cls, config_path: Path, zip_password: str = "") -> dict[str, Any]:  # nosec: empty default is for optional password, not hardcoded secret
         """Load TOML data from file or ZIP archive.
 
         Args:
@@ -84,7 +84,7 @@ class Web3CliConfig(BaseModel):
             return tomllib.load(f)
 
     @classmethod
-    def read_toml_config(cls, config_path: Path, zip_password: str = "") -> Result[Self]:  # nosec
+    def read_toml_config(cls, config_path: Path, zip_password: str = "") -> Result[Self]:  # nosec: empty default is for optional password, not hardcoded secret
         """Read and validate TOML config file.
 
         Args:
@@ -98,12 +98,12 @@ class Web3CliConfig(BaseModel):
             data = cls._load_toml_data(config_path, zip_password)
             return Result.ok(cls(**data))
         except ValidationError as e:
-            return Result.err(("validator_error", e), extra={"errors": e.errors()})
+            return Result.err(("validator_error", e), context={"errors": e.errors()})
         except Exception as e:
             return Result.err(e)
 
     @classmethod
-    async def read_toml_config_async(cls, config_path: Path, zip_password: str = "") -> Result[Self]:  # nosec
+    async def read_toml_config_async(cls, config_path: Path, zip_password: str = "") -> Result[Self]:  # nosec: empty default is for optional password, not hardcoded secret
         """Read and validate TOML config file with async validators.
 
         Use this method when your config has async model validators that
@@ -121,7 +121,7 @@ class Web3CliConfig(BaseModel):
             model = await cls.model_validate(data)  # type: ignore[misc]
             return Result.ok(model)
         except ValidationError as e:
-            return Result.err(("validator_error", e), extra={"errors": e.errors()})
+            return Result.err(("validator_error", e), context={"errors": e.errors()})
         except Exception as e:
             return Result.err(e)
 
@@ -132,14 +132,14 @@ class Web3CliConfig(BaseModel):
         Args:
             res: Failed Result containing error information
         """
-        if res.error == "validator_error" and res.extra:
-            mm_print.plain("config validation errors")
-            for e in res.extra["errors"]:
+        if res.error == "validator_error" and res.context:
+            print_plain("config validation errors")
+            for e in res.context["errors"]:
                 loc = e["loc"]
                 field = ".".join(str(lo) for lo in loc) if len(loc) > 0 else ""
-                mm_print.plain(f"{field} {e['msg']}")
+                print_plain(f"{field} {e['msg']}")
         else:
-            mm_print.plain(f"can't parse config file: {res.error} {res.extra}")
+            print_plain(f"can't parse config file: {res.error} {res.context}")
         sys.exit(1)
 
 
@@ -156,5 +156,7 @@ def read_text_from_zip_archive(zip_archive_path: Path, filename: str | None = No
     """
     with ZipFile(zip_archive_path) as zipfile:
         if filename is None:
+            if not zipfile.filelist:
+                raise ValueError(f"ZIP archive is empty: {zip_archive_path}")
             filename = zipfile.filelist[0].filename
         return zipfile.read(filename, pwd=password.encode() if password else None).decode()

mm_web3/log.py

@@ -5,6 +5,13 @@ from loguru import logger
 
 
 def init_loguru(debug: bool, debug_file: Path | None, info_file: Path | None) -> None:
+    """Initialize loguru logger with console and optional file outputs.
+
+    Args:
+        debug: If True, set DEBUG level with timestamps; otherwise INFO level with plain format
+        debug_file: Optional file path for DEBUG level logs with timestamps
+        info_file: Optional file path for INFO level logs with plain format
+    """
     if debug:
         level = "DEBUG"
         format_ = "<green>{time:YYYY-MM-DD HH:mm:ss}</green> <level>{level}</level> {message}"

mm_web3/proxy.py

@@ -65,7 +65,7 @@ def is_valid_proxy_url(proxy_url: str) -> bool:
     Check if the given URL is a valid proxy URL.
 
     A valid proxy URL must have:
-      - A scheme in {"http", "https", "socks4", "socks5", "zsocks5h"}.
+      - A scheme in {"http", "https", "socks4", "socks5", "socks5h"}.
       - A non-empty hostname.
       - A specified port.
       - No extra path components (the path must be empty or "/").
@@ -100,7 +100,4 @@ def is_valid_proxy_url(proxy_url: str) -> bool:
         return False
 
     # Ensure that there is no extra path (only allow an empty path or a single "/")
-    if parsed.path and parsed.path not in ("", "/"):  # noqa: SIM103
-        return False
-
-    return True
+    return not parsed.path or parsed.path in ("", "/")

mm_web3/validators.py

@@ -62,32 +62,32 @@ class ConfigValidators:
             ValueError: If addresses are invalid, format is wrong, or no transfers found
         """
 
+        def _parse_transfer_line(line: str, source: str) -> Transfer:
+            arr = line.split()
+            if len(arr) < 2 or len(arr) > 3:
+                raise ValueError(f"illegal {source}: {line}")
+            return Transfer(from_address=arr[0], to_address=arr[1], value=arr[2] if len(arr) > 2 else "")
+
         def validator(v: str) -> list[Transfer]:
-            result = []
+            result: list[Transfer] = []
             for line in parse_lines(v, remove_comments=True):  # don't use lowercase here because it can be a file: /To/Path.txt
                 if line.startswith("file:"):
-                    for file_line in read_lines_from_file(line.removeprefix("file:").strip()):
-                        arr = file_line.split()
-                        if len(arr) < 2 or len(arr) > 3:
-                            raise ValueError(f"illegal file_line: {file_line}")
-                        result.append(Transfer(from_address=arr[0], to_address=arr[1], value=arr[2] if len(arr) > 2 else ""))
-
+                    result.extend(
+                        _parse_transfer_line(fl, "file_line") for fl in read_lines_from_file(line.removeprefix("file:").strip())
+                    )
                 else:
-                    arr = line.split()
-                    if len(arr) < 2 or len(arr) > 3:
-                        raise ValueError(f"illegal line: {line}")
-                    result.append(Transfer(from_address=arr[0], to_address=arr[1], value=arr[2] if len(arr) > 2 else ""))
+                    result.append(_parse_transfer_line(line, "line"))
 
             if lowercase:
                 result = [
                     Transfer(from_address=r.from_address.lower(), to_address=r.to_address.lower(), value=r.value) for r in result
                 ]
 
-            for route in result:
-                if not is_address(route.from_address):
-                    raise ValueError(f"illegal address: {route.from_address}")
-                if not is_address(route.to_address):
-                    raise ValueError(f"illegal address: {route.to_address}")
+            for transfer in result:
+                if not is_address(transfer.from_address):
+                    raise ValueError(f"illegal address: {transfer.from_address}")
+                if not is_address(transfer.to_address):
+                    raise ValueError(f"illegal address: {transfer.to_address}")
 
             if not result:
                 raise ValueError("No valid transfers found")

mm_web3-0.6.0.dist-info/METADATA

@@ -0,0 +1,8 @@
+Metadata-Version: 2.4
+Name: mm-web3
+Version: 0.6.0
+Requires-Python: >=3.14
+Requires-Dist: loguru>=0.7.3
+Requires-Dist: mm-http~=0.3.0
+Requires-Dist: mm-print~=0.3.0
+Requires-Dist: mm-std~=0.7.0

mm_web3-0.6.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+mm_web3/__init__.py,sha256=uGPiC3UGbashWlRiIr27CjqGp1xUTHA6goDBO5cGBBU,1296
+mm_web3/account.py,sha256=9IkbcEB3wyyPfvKkwaJqTdZQuHfAGeEoipjkMFXLu54,3676
+mm_web3/calcs.py,sha256=kPS7qvfdvnk6j3Iu8swjhfAJ7d9x2Ezdz_dTg9KH-GM,7924
+mm_web3/config.py,sha256=d6ZCF8-DEnD-C-dV7yntIuqkjJAnT4jrNd_skbfS4QA,6185
+mm_web3/log.py,sha256=RJXTwLwhCT0YiuRRk1U9y17eW31ZOozv-G2aYZ9yO6A,992
+mm_web3/network.py,sha256=99Qv59rGAvf5akp8Sbow_PXkKQk6B3Yh8oy2kH6JhFw,6902
+mm_web3/node.py,sha256=vXO9PsKZ_yfKsLKc5R_HL62CAKTDJbOg4BHijqw4IbM,902
+mm_web3/proxy.py,sha256=YBPZpS7sQ2ivjElaSHSC9DTsjXBxxcFdI_D2vxpodyg,3470
+mm_web3/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_web3/retry.py,sha256=OuiPyxADn16b748ZYe5XVff6hVMumj4bnAteQSvUYs4,2390
+mm_web3/utils.py,sha256=k-x8R8bLRZKBN3xqeepukD9Tzwt97qiTUETSrK7lIHM,2009
+mm_web3/validators.py,sha256=qK__aMbkFF0Sjcdq6LlGvAKH-KKLg92PKJ3lVAdblT8,12809
+mm_web3-0.6.0.dist-info/METADATA,sha256=Iy2yL-8SHM8SCn8MEHX2fS36uY9Xa9EXKcfnNDT7A10,194
+mm_web3-0.6.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+mm_web3-0.6.0.dist-info/RECORD,,

mm_web3-0.5.7.dist-info/METADATA

@@ -1,8 +0,0 @@
-Metadata-Version: 2.4
-Name: mm-web3
-Version: 0.5.7
-Requires-Python: >=3.13
-Requires-Dist: loguru>=0.7.3
-Requires-Dist: mm-http~=0.2.5
-Requires-Dist: mm-print~=0.2.2
-Requires-Dist: mm-std~=0.6.0

mm_web3-0.5.7.dist-info/RECORD

@@ -1,15 +0,0 @@
-mm_web3/__init__.py,sha256=uGPiC3UGbashWlRiIr27CjqGp1xUTHA6goDBO5cGBBU,1296
-mm_web3/account.py,sha256=9IkbcEB3wyyPfvKkwaJqTdZQuHfAGeEoipjkMFXLu54,3676
-mm_web3/calcs.py,sha256=b5mWCDE8UdQjxkdVbWPMRNaMbG6XteSlqG0M2CYDQe4,7860
-mm_web3/config.py,sha256=A_xHvWQgJlAZPI7iJ0q-53gFA1WWOIKQl3uMTlQm6qM,5733
-mm_web3/log.py,sha256=rvrObh-Jo9nO0OEIsLD5-f98mxeuA1GQlkYUY7xLb0Q,653
-mm_web3/network.py,sha256=99Qv59rGAvf5akp8Sbow_PXkKQk6B3Yh8oy2kH6JhFw,6902
-mm_web3/node.py,sha256=vXO9PsKZ_yfKsLKc5R_HL62CAKTDJbOg4BHijqw4IbM,902
-mm_web3/proxy.py,sha256=dfFeb4cUWfPwxmK7EUZ5WBu_XPkytzDMIYvXYrz8gUk,3523
-mm_web3/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_web3/retry.py,sha256=OuiPyxADn16b748ZYe5XVff6hVMumj4bnAteQSvUYs4,2390
-mm_web3/utils.py,sha256=k-x8R8bLRZKBN3xqeepukD9Tzwt97qiTUETSrK7lIHM,2009
-mm_web3/validators.py,sha256=nt1AXiLfz1ek5PWsqVMtgvENSsCky0-B0NtrXuf0afI,12894
-mm_web3-0.5.7.dist-info/METADATA,sha256=7pCjbAphA88PPPNPKbxvwElsFYUULUlml1f7nim2e8Q,194
-mm_web3-0.5.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-mm_web3-0.5.7.dist-info/RECORD,,