mm-eth 0.2.2__tar.gz → 0.2.4__tar.gz

{mm_eth-0.2.2 → mm_eth-0.2.4}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: mm-eth
-Version: 0.2.2
+Version: 0.2.4
 Requires-Python: >=3.12
 Requires-Dist: loguru~=0.7.3
-Requires-Dist: mm-std~=0.1.11
+Requires-Dist: mm-std~=0.1.12
 Requires-Dist: typer>=0.15.1
 Requires-Dist: web3~=7.7.0
 Requires-Dist: websocket-client~=1.8.0

{mm_eth-0.2.2 → mm_eth-0.2.4}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "mm-eth"
-version = "0.2.2"
+version = "0.2.4"
 description = ""
 requires-python = ">=3.12"
 dependencies = [
-    "mm-std~=0.1.11",
+    "mm-std~=0.1.12",
     "websocket-client~=1.8.0",
     "web3~=7.7.0",
     "loguru~=0.7.3",
@@ -68,6 +68,8 @@ ignore = [
     "RET503", # flake8-return: implicit-return
     "COM812", # it's used in ruff formatter
 ]
+[tool.ruff.lint.pep8-naming]
+classmethod-decorators = ["field_validator"]
 [tool.ruff.lint.per-file-ignores]
 "tests/*.py" = ["ANN", "S"]
 [tool.ruff.format]

{mm_eth-0.2.2 → mm_eth-0.2.4}/src/mm_eth/cli/cli_utils.py

@@ -96,10 +96,7 @@ def load_private_keys_from_file(private_keys_file: str) -> list[str]:
     return [line for line in lines if is_private_key(line)]
 
 
-def read_config[T: BaseConfig](config_type: type[T], config_path: Path) -> T:
-    res = config_type.read_config(config_path)
-    if res.is_ok():
-        return res.unwrap()
-
-    print_json(res.err)
-    sys.exit(1)
+def print_config_and_exit(exit_: bool, config: BaseConfig, exclude: set[str] | None = None) -> None:
+    if exit_:
+        print_json(config.model_dump(exclude=exclude))
+        sys.exit(0)

{mm_eth-0.2.2 → mm_eth-0.2.4}/src/mm_eth/cli/cmd/balances_cmd.py

@@ -1,8 +1,6 @@
-import sys
 from dataclasses import dataclass
-from pathlib import Path
 
-from mm_std import BaseConfig, Err, Ok, fatal, print_json
+from mm_std import BaseConfig, Err, Ok, fatal
 from pydantic import Field, field_validator
 from rich.live import Live
 from rich.table import Table
@@ -19,12 +17,10 @@ class Config(BaseConfig):
     round_ndigits: int = 5
 
     @field_validator("nodes", mode="before")
-    @classmethod
     def nodes_validator(cls, v: str | list[str] | None) -> list[str]:
         return validators.nodes_validator(v)
 
     @field_validator("tokens", "addresses", mode="before")
-    @classmethod
     def addresses_validator(cls, v: str | list[str] | None) -> list[str]:
         return validators.addresses_validator(v)
 
@@ -37,10 +33,8 @@ class Token:
 
 
 def run(config_path: str, print_config: bool, wei: bool, show_nonce: bool) -> None:
-    config = cli_utils.read_config(Config, Path(config_path))
-    if print_config:
-        print_json(config.model_dump())
-        sys.exit(0)
+    config = Config.read_config_or_exit(config_path)
+    cli_utils.print_config_and_exit(print_config, config)
 
     tokens = _get_tokens_info(config)
 

{mm_eth-0.2.2 → mm_eth-0.2.4}/src/mm_eth/cli/cmd/call_contract_cmd.py

@@ -1,9 +1,7 @@
 import json
-import sys
 from logging import fatal
-from pathlib import Path
 
-from mm_std import BaseConfig, Err, print_json, print_plain
+from mm_std import BaseConfig, Err, print_plain
 from pydantic import StrictStr
 
 from mm_eth import abi, rpc
@@ -19,10 +17,8 @@ class Config(BaseConfig):
 
 
 def run(config_path: str, print_config: bool) -> None:
-    config = cli_utils.read_config(Config, Path(config_path))
-    if print_config:
-        print_json(config.model_dump())
-        sys.exit(0)
+    config = Config.read_config_or_exit(config_path)
+    cli_utils.print_config_and_exit(print_config, config)
 
     input_data = abi.encode_function_input_by_signature(
         config.function_signature,

{mm_eth-0.2.2 → mm_eth-0.2.4}/src/mm_eth/cli/cmd/deploy_cmd.py

@@ -1,8 +1,5 @@
-import sys
-from pathlib import Path
-
 import yaml
-from mm_std import BaseConfig, fatal, print_json
+from mm_std import BaseConfig, fatal
 from pydantic import StrictStr
 
 from mm_eth import account, deploy
@@ -24,10 +21,8 @@ class Config(BaseConfig):
 
 
 def run(config_path: str, *, print_config: bool) -> None:
-    config = cli_utils.read_config(Config, Path(config_path))
-    if print_config:
-        print_json(config.model_dump(exclude={"private_key"}))
-        sys.exit(0)
+    config = Config.read_config_or_exit(config_path)
+    cli_utils.print_config_and_exit(print_config, config, {"private_key"})
 
     constructor_types = yaml.full_load(config.constructor_types)
     constructor_values = yaml.full_load(config.constructor_values)

{mm_eth-0.2.2 → mm_eth-0.2.4}/src/mm_eth/cli/cmd/send_contract_cmd.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from typing import Self
 
 from loguru import logger
-from mm_std import BaseConfig, Err, Ok, print_json, str_to_list, utc_now
+from mm_std import BaseConfig, Err, Ok, str_to_list, utc_now
 from pydantic import Field, StrictStr, field_validator, model_validator
 
 from mm_eth import abi, rpc
@@ -35,22 +35,18 @@ class Config(BaseConfig):
     log_info: str | None = None
 
     @field_validator("log_debug", "log_info", mode="before")
-    @classmethod
     def log_validator(cls, v: str | None) -> str | None:
         return validators.log_validator(v)
 
     @field_validator("nodes", "from_addresses", mode="before")
-    @classmethod
     def list_validator(cls, v: str | list[str] | None) -> list[str]:
         return validators.nodes_validator(v)
 
     @field_validator("from_addresses", mode="before")
-    @classmethod
     def from_addresses_validator(cls, v: str | list[str] | None) -> list[str]:
         return str_to_list(v, remove_comments=True, lower=True)
 
     @field_validator("private_keys", mode="before")
-    @classmethod
     def private_keys_validator(cls, v: str | list[str] | None) -> dict[str, str]:
         if v is None:
             return {}
@@ -118,10 +114,8 @@ def run(
     no_receipt: bool,
     emulate: bool,
 ) -> None:
-    config = cli_utils.read_config(Config, Path(config_path))
-    if print_config:
-        print_json(config.model_dump(exclude={"private_key"}))
-        sys.exit(0)
+    config = Config.read_config_or_exit(config_path)
+    cli_utils.print_config_and_exit(print_config, config, {"private_key"})
 
     cli_utils.init_logger(debug, config.log_debug, config.log_info)
     rpc_helpers.check_nodes_for_chain_id(config.nodes, config.chain_id)

{mm_eth-0.2.2 → mm_eth-0.2.4}/src/mm_eth/cli/cmd/transfer_erc20_cmd.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Self
 
 from loguru import logger
-from mm_std import BaseConfig, Err, Ok, fatal, print_json, str_to_list, utc_now
+from mm_std import BaseConfig, Err, Ok, fatal, str_to_list, utc_now
 from pydantic import Field, StrictStr, field_validator, model_validator
 
 from mm_eth import erc20, rpc
@@ -44,17 +44,14 @@ class Config(BaseConfig):
         return [tx.from_address for tx in self.txs]
 
     @field_validator("log_debug", "log_info", mode="before")
-    @classmethod
     def log_validator(cls, v: str | None) -> str | None:
         return validators.log_validator(v)
 
     @field_validator("nodes", mode="before")
-    @classmethod
     def nodes_validator(cls, v: str | list[str] | None) -> list[str]:
         return validators.nodes_validator(v)
 
     @field_validator("private_keys", mode="before")
-    @classmethod
     def private_keys_validator(cls, v: str | list[str] | None) -> dict[str, str]:
         if v is None:
             return {}
@@ -130,10 +127,8 @@ def run(
     no_receipt: bool,
     emulate: bool,
 ) -> None:
-    config = cli_utils.read_config(Config, Path(config_path))
-    if print_config:
-        print_json(config.model_dump(exclude={"private_key", "addresses_map"}))
-        sys.exit(0)
+    config = Config.read_config_or_exit(config_path)
+    cli_utils.print_config_and_exit(print_config, config, {"private_key", "addresses_map"})
 
     cli_utils.init_logger(debug, config.log_debug, config.log_info)
     rpc_helpers.check_nodes_for_chain_id(config.nodes, config.chain_id)

{mm_eth-0.2.2 → mm_eth-0.2.4}/src/mm_eth/cli/cmd/transfer_eth_cmd.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Self
 
 from loguru import logger
-from mm_std import BaseConfig, Err, Ok, print_json, str_to_list, utc_now
+from mm_std import BaseConfig, Err, Ok, str_to_list, utc_now
 from pydantic import Field, StrictStr, field_validator, model_validator
 
 from mm_eth import rpc
@@ -43,17 +43,14 @@ class Config(BaseConfig):
         return [tx.from_address for tx in self.txs]
 
     @field_validator("log_debug", "log_info", mode="before")
-    @classmethod
     def log_validator(cls, v: str | None) -> str | None:
         return validators.log_validator(v)
 
     @field_validator("nodes", mode="before")
-    @classmethod
     def nodes_validator(cls, v: str | list[str] | None) -> list[str]:
         return validators.nodes_validator(v)
 
     @field_validator("private_keys", mode="before")
-    @classmethod
     def private_keys_validator(cls, v: str | list[str] | None) -> dict[str, str]:
         if v is None:
             return {}
@@ -128,10 +125,8 @@ def run(
     no_receipt: bool,
     emulate: bool,
 ) -> None:
-    config = cli_utils.read_config(Config, Path(config_path))
-    if print_config:
-        print_json(config.model_dump(exclude={"private_key", "addresses_map"}))
-        sys.exit(0)
+    config = Config.read_config_or_exit(config_path)
+    cli_utils.print_config_and_exit(print_config, config, {"private_key", "addresses_map"})
 
     cli_utils.init_logger(debug, config.log_debug, config.log_info)
     rpc_helpers.check_nodes_for_chain_id(config.nodes, config.chain_id)

{mm_eth-0.2.2 → mm_eth-0.2.4}/uv.lock

@@ -730,7 +730,7 @@ wheels = [
 
 [[package]]
 name = "mm-eth"
-version = "0.2.1"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "loguru" },
@@ -754,7 +754,7 @@ dev = [
 [package.metadata]
 requires-dist = [
     { name = "loguru", specifier = "~=0.7.3" },
-    { name = "mm-std", specifier = "~=0.1.11" },
+    { name = "mm-std", specifier = "~=0.1.12" },
     { name = "typer", specifier = ">=0.15.1" },
     { name = "web3", specifier = "~=7.7.0" },
     { name = "websocket-client", specifier = "~=1.8.0" },
@@ -773,7 +773,7 @@ dev = [
 
 [[package]]
 name = "mm-std"
-version = "0.1.11"
+version = "0.1.12"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "cryptography" },
@@ -785,7 +785,7 @@ dependencies = [
     { name = "rich" },
 ]
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/45/44/9b5b90015a3aa2906f1eb15a4d4404635f6b05e43c5023b770bd4c7d7774/mm_std-0.1.11-py3-none-any.whl", hash = "sha256:3ea736ccb313bf6d0c37272104ba1f79deb0874c07bd6091d504fcf9e703cdfe", size = 14444 },
+    { url = "https://files.pythonhosted.org/packages/ca/18/ea37b98761b2d39ff2d45e985e4ef5eedae08a421cee3ee19088a9c0da03/mm_std-0.1.12-py3-none-any.whl", hash = "sha256:2e3d3ed745755096cecf9690ca2fb772abed1a4064935717ce3c8824b7cabd83", size = 14699 },
 ]
 
 [[package]]