mm-eth 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → mm_eth-0.2.4.dist-info}/METADATA

@@ -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.dist-info → mm_eth-0.2.4.dist-info}/RECORD

@@ -16,32 +16,32 @@ mm_eth/vault.py,sha256=h8NyiOQh5YFskh1lZA3KyvnJUnxl9769ME2ChplG0CM,1477
 mm_eth/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_eth/cli/calcs.py,sha256=yDx3VgFmCLRYWpZVqyk_-mXIgTVFDPKGTktx-7H2XDw,4426
 mm_eth/cli/cli.py,sha256=FfEgosWXa9gIGRuwSbPILvaDQ2Crh9hqTU50CqatvgY,8956
-mm_eth/cli/cli_utils.py,sha256=H8aasm4CBuKoXPA_ZGBTdTBs2ABAR7niFGqQjXOrYOU,3706
+mm_eth/cli/cli_utils.py,sha256=jkw2hDzR2hrYKmY8egR4RicLHe4RFjC7yhShtA0HzhQ,3682
 mm_eth/cli/print_helpers.py,sha256=yOiOFjTKloumwf07AqNIHQswUo8t0yuT9bpeGBGl60Q,1470
 mm_eth/cli/rpc_helpers.py,sha256=tAJBUHwpH0jPvg0Hrm-cwpOrpp9GUb91e4ZdwixNUQg,4723
 mm_eth/cli/validators.py,sha256=CWOXorI2HGajhLvQ354d2cCl5S3JC7tKUxWmmVn6j4Y,2417
 mm_eth/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_eth/cli/cmd/balance_cmd.py,sha256=SjRSbGF8QFMBHncEyzPdVUi_rjOwNW2wxfbFsRBV2A0,2097
-mm_eth/cli/cmd/balances_cmd.py,sha256=XOjcyqJLSQL1Jj40fnw3la2ZRGwpZU-NIBpZbCEQNhc,4328
-mm_eth/cli/cmd/call_contract_cmd.py,sha256=lI1QnFTydYTFhZmxmQWvyMCnhTodckck9KGXUBq5PU4,1250
+mm_eth/cli/cmd/balances_cmd.py,sha256=3kxgHBmMDbzt0E7iaNaVaP_YaQArttlHaOfnB2usez8,4214
+mm_eth/cli/cmd/call_contract_cmd.py,sha256=T6IHzxHuymJsEog2y7oMKNiHahip_W3FIk0adH4T0W4,1170
 mm_eth/cli/cmd/config_example_cmd.py,sha256=hMfrFxjIP0xZllJRRxi99qhF8tzJI3lrp-XudFEWF1g,270
-mm_eth/cli/cmd/deploy_cmd.py,sha256=543wR11I5GchYzTqWbUuyxcWMvZs0ZbcT0V_OLdwsew,1260
+mm_eth/cli/cmd/deploy_cmd.py,sha256=nFJExEcKbm-6pE-r-XDY6pExOJywSSK7fN_gMZs9hc4,1173
 mm_eth/cli/cmd/encode_input_data_cmd.py,sha256=9UQ1MKPEFQJ8j_COsP3KGKhwOf9tT3feBezI8vvxTlw,267
 mm_eth/cli/cmd/mnemonic_cmd.py,sha256=Mb0H0inSNCa93GEPxGYQi7BnPe11mnLjnspfe7h54I4,972
 mm_eth/cli/cmd/node_cmd.py,sha256=mUqixPGNHzuKCJvk1Fd5VaUGumpbR2AE7raGmXZscg4,1943
 mm_eth/cli/cmd/private_key_cmd.py,sha256=Fv_2OLog1h32pIP7PJITwl_pHdy3BXvaDRcXZsxY1xo,241
 mm_eth/cli/cmd/rpc_cmd.py,sha256=02q82YqgbPezfEBmV_QBCIeNReE7ktkPych8Xr9ann8,2186
-mm_eth/cli/cmd/send_contract_cmd.py,sha256=fknRzpCKV4nWMus26npeCVCb2JfiHTsSMFGPnP-465o,9141
+mm_eth/cli/cmd/send_contract_cmd.py,sha256=cGVP1hZOp64e5rN5uCsA2QkG5NIN9Car_2IZDWh4RvA,9023
 mm_eth/cli/cmd/solc_cmd.py,sha256=tBpeMdPfGs2iQIMaIJAAhMh1a3KyXHwyninfXPVpsgs,677
 mm_eth/cli/cmd/token_cmd.py,sha256=4y6ZQpLOJ33_iNuKpm9tZXh4RntWhmPUcizgaNNBzaw,1102
-mm_eth/cli/cmd/transfer_erc20_cmd.py,sha256=EXOy303fKd3cuC8QEVghAjJw0qrLoO4GFfT37whMt2E,10296
-mm_eth/cli/cmd/transfer_eth_cmd.py,sha256=rBFZzDntXX0ouGb1B15rRaEiEoF88C-It2aiJhSVfzQ,9470
+mm_eth/cli/cmd/transfer_erc20_cmd.py,sha256=fNja8Krx5OLzEvZypt1d5CogrN9BsLHVG48DI1W0twM,10195
+mm_eth/cli/cmd/transfer_eth_cmd.py,sha256=_LgSGaFD0GbzODA3OfIUXjKGFSNBHltNM0fcgDbnEN8,9369
 mm_eth/cli/cmd/vault_cmd.py,sha256=rRTclz0U6N_87KFsssdvZhi3_f6tmkHiYxMsIoVeBGc,532
 mm_eth/cli/config_examples/balances.yml,sha256=fpXJfoOSqOrkoWpqO7-HrTTb5OBs9PM-PpZ1ulqWUnY,399
 mm_eth/cli/config_examples/call_contract.yml,sha256=E0XuWuBnbhyTYfxNqaoxH6Cy7UCYqMLDwoEu_4OSV3M,233
 mm_eth/cli/config_examples/transfer_erc20.yml,sha256=mCUpUfqzZjTvst8kqd3EGzJY0S7cr48ySqS6yZhzLdI,1324
 mm_eth/cli/config_examples/transfer_eth.yml,sha256=i4hh3-LTcpl7JsrSuuM6gDi23B5ZnCeEnaYazQO3bzQ,1181
-mm_eth-0.2.2.dist-info/METADATA,sha256=PUaC1zS4IBlq6bwzjhGXqykcW2hyD9sQ0PKwTHM2DQY,228
-mm_eth-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_eth-0.2.2.dist-info/entry_points.txt,sha256=aGhpsozl8NIrkuUcX5fSgURCcDhr3ShUdeTSIrJq4oc,46
-mm_eth-0.2.2.dist-info/RECORD,,
+mm_eth-0.2.4.dist-info/METADATA,sha256=XnqJ7NqhVE7Ck7We-qN96VS8DCLPjMfxlSR3MpvGZMs,228
+mm_eth-0.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_eth-0.2.4.dist-info/entry_points.txt,sha256=aGhpsozl8NIrkuUcX5fSgURCcDhr3ShUdeTSIrJq4oc,46
+mm_eth-0.2.4.dist-info/RECORD,,