mm-eth 0.4.1__py3-none-any.whl → 0.5.0__py3-none-any.whl

mm_eth/cli/cli.py

@@ -17,7 +17,6 @@ from .cmd import (
     example_cmd,
     node_cmd,
     rpc_cmd,
-    send_contract_cmd,
     solc_cmd,
     token_cmd,
     transfer_cmd,
@@ -27,7 +26,6 @@ from .cmd import (
 from .cmd.balances_cmd import BalancesCmdParams
 from .cmd.call_contract_cmd import CallContractCmdParams
 from .cmd.deploy_cmd import DeployCmdParams
-from .cmd.send_contract_cmd import SendContractCmdParams
 from .cmd.transfer_cmd import TransferCmdParams
 from .cmd.wallet import mnemonic_cmd, private_key_cmd
 
@@ -147,6 +145,7 @@ def tx_command(
 def transfer_command(
     config_path: Path,
     print_balances: bool = typer.Option(False, "--balances", "-b", help="Print balances and exit"),
+    print_transfers: bool = typer.Option(False, "--transfers", "-t", help="Print transfers (from, to, value) and exit"),
     print_config: bool = typer.Option(False, "--config", "-c", help="Print config and exit"),
     emulate: bool = typer.Option(False, "--emulate", "-e", help="Emulate transaction posting"),
     skip_receipt: bool = typer.Option(False, "--skip-receipt", help="Don't wait for a tx receipt"),
@@ -156,6 +155,7 @@ def transfer_command(
         TransferCmdParams(
             config_path=config_path,
             print_balances=print_balances,
+            print_transfers=print_transfers,
             print_config=print_config,
             debug=debug,
             skip_receipt=skip_receipt,
@@ -164,25 +164,25 @@ def transfer_command(
     )
 
 
-@app.command(name="send-contract", help="Send transactions to a contract")
-def send_contract_command(
-    config_path: Path,
-    print_balances: bool = typer.Option(False, "--balances", "-b", help="Print balances and exit"),
-    print_config: bool = typer.Option(False, "--config", "-c", help="Print config and exit"),
-    emulate: bool = typer.Option(False, "--emulate", "-e", help="Emulate transaction posting"),
-    no_receipt: bool = typer.Option(False, "--no-receipt", "-nr", help="Don't wait for a tx receipt"),
-    debug: bool = typer.Option(False, "--debug", "-d", help="Print debug info"),
-) -> None:
-    send_contract_cmd.run(
-        SendContractCmdParams(
-            config_path=config_path,
-            print_balances=print_balances,
-            print_config=print_config,
-            debug=debug,
-            no_receipt=no_receipt,
-            emulate=emulate,
-        )
-    )
+# @app.command(name="send-contract", help="Send transactions to a contract")
+# def send_contract_command(
+#     config_path: Path,
+#     print_balances: bool = typer.Option(False, "--balances", "-b", help="Print balances and exit"),
+#     print_config: bool = typer.Option(False, "--config", "-c", help="Print config and exit"),
+#     emulate: bool = typer.Option(False, "--emulate", "-e", help="Emulate transaction posting"),
+#     no_receipt: bool = typer.Option(False, "--no-receipt", "-nr", help="Don't wait for a tx receipt"),
+#     debug: bool = typer.Option(False, "--debug", "-d", help="Print debug info"),
+# ) -> None:
+#     send_contract_cmd.run(
+#         SendContractCmdParams(
+#             config_path=config_path,
+#             print_balances=print_balances,
+#             print_config=print_config,
+#             debug=debug,
+#             no_receipt=no_receipt,
+#             emulate=emulate,
+#         )
+#     )
 
 
 @app.command(name="balances", help="Print base and ERC20 token balances")

mm_eth/cli/cmd/transfer_cmd.py

@@ -5,9 +5,10 @@ from typing import Annotated, Self
 
 import mm_crypto_utils
 from loguru import logger
-from mm_crypto_utils import AddressToPrivate, TxRoute
+from mm_crypto_utils import AddressToPrivate, Transfer
 from mm_std import BaseConfig, Err, fatal, utc_now
 from pydantic import AfterValidator, BeforeValidator, Field, model_validator
+from rich.console import Console
 from rich.live import Live
 from rich.table import Table
 
@@ -23,7 +24,7 @@ from mm_eth.utils import from_wei_str
 class Config(BaseConfig):
     nodes: Annotated[list[str], BeforeValidator(Validators.nodes())]
     chain_id: int
-    routes: Annotated[list[TxRoute], BeforeValidator(Validators.eth_routes())]
+    transfers: Annotated[list[Transfer], BeforeValidator(Validators.eth_transfers())]
     private_keys: Annotated[AddressToPrivate, BeforeValidator(Validators.eth_private_keys())]
     token: Annotated[str | None, AfterValidator(Validators.eth_address())] = None  # if None, then eth transfer
     token_decimals: int = -1
@@ -42,13 +43,20 @@ class Config(BaseConfig):
 
     @property
     def from_addresses(self) -> list[str]:
-        return [r.from_address for r in self.routes]
+        return [r.from_address for r in self.transfers]
 
     @model_validator(mode="after")
     def final_validator(self) -> Self:
         if not self.private_keys.contains_all_addresses(self.from_addresses):
             raise ValueError("private keys are not set for all addresses")
 
+        for transfer in self.transfers:  # If value is not set for a transfer, then set it to the global value of the config.
+            if not transfer.value:
+                transfer.value = self.value
+        for transfer in self.transfers:  # Check all transfers have a value.
+            if not transfer.value:
+                raise ValueError(f"{transfer.log_prefix}: value is not set")
+
         if self.token:
             Validators.valid_token_expression("balance")(self.value)
             if self.value_min_limit:
@@ -69,6 +77,7 @@ class Config(BaseConfig):
 
 class TransferCmdParams(BaseConfigParams):
     print_balances: bool
+    print_transfers: bool
     debug: bool
     skip_receipt: bool
     emulate: bool
@@ -82,6 +91,10 @@ def run(cmd_params: TransferCmdParams) -> None:
 
     rpc_helpers.check_nodes_for_chain_id(config.nodes, config.chain_id)
 
+    if cmd_params.print_transfers:
+        _print_transfers(config)
+        sys.exit(0)
+
     if cmd_params.print_balances:
         _print_balances(config)
         sys.exit(0)
@@ -93,9 +106,9 @@ def _run_transfers(config: Config, cmd_params: TransferCmdParams) -> None:
     mm_crypto_utils.init_logger(cmd_params.debug, config.log_debug, config.log_info)
     logger.info(f"transfer {cmd_params.config_path}: started at {utc_now()} UTC")
     logger.debug(f"config={config.model_dump(exclude={'private_keys'}) | {'version': cli_utils.get_version()}}")
-    for i, route in enumerate(config.routes):
-        _transfer(route, config, cmd_params)
-        if config.delay is not None and i < len(config.routes) - 1:
+    for i, transfer in enumerate(config.transfers):
+        _transfer(transfer, config, cmd_params)
+        if config.delay is not None and i < len(config.transfers) - 1:
             delay_value = mm_crypto_utils.calc_decimal_value(config.delay)
             logger.info(f"delay {delay_value} seconds")
             if not cmd_params.emulate:
@@ -103,34 +116,34 @@ def _run_transfers(config: Config, cmd_params: TransferCmdParams) -> None:
     logger.info(f"finished at {utc_now()} UTC")
 
 
-def _transfer(route: TxRoute, config: Config, cmd_params: TransferCmdParams) -> None:
-    nonce = rpc_helpers.get_nonce(config.nodes, route.from_address, route.log_prefix)
+def _transfer(t: Transfer, config: Config, cmd_params: TransferCmdParams) -> None:
+    nonce = rpc_helpers.get_nonce(config.nodes, t.from_address, t.log_prefix)
     if nonce is None:
         return
 
-    max_fee = rpc_helpers.calc_max_fee(config.nodes, config.max_fee, route.log_prefix)
+    max_fee = rpc_helpers.calc_max_fee(config.nodes, config.max_fee, t.log_prefix)
     if max_fee is None:
         return
 
-    if rpc_helpers.is_max_fee_limit_exceeded(max_fee, config.max_fee_limit, route.log_prefix):
+    if rpc_helpers.is_max_fee_limit_exceeded(max_fee, config.max_fee_limit, t.log_prefix):
         return
 
-    gas = _calc_gas(route, config)
+    gas = _calc_gas(t, config)
     if gas is None:
         return
 
-    value = _calc_value(route, max_fee=max_fee, gas=gas, config=config)
+    value = _calc_value(t, max_fee=max_fee, gas=gas, config=config)
     if value is None:
         return
 
-    if not _check_value_min_limit(route, value, config):
+    if not _check_value_min_limit(t, value, config):
         return
 
     priority_fee = calc_eth_expression(config.priority_fee)
 
     # emulate?
     if cmd_params.emulate:
-        msg = f"{route.log_prefix}: emulate,"
+        msg = f"{t.log_prefix}: emulate,"
         msg += f" value={_value_with_suffix(value, config)},"
         msg += f" max_fee={from_wei_str(max_fee, 'gwei', config.round_ndigits)},"
         msg += f" priority_fee={from_wei_str(priority_fee, 'gwei', config.round_ndigits)},"
@@ -138,39 +151,39 @@ def _transfer(route: TxRoute, config: Config, cmd_params: TransferCmdParams) ->
         logger.info(msg)
         return
 
-    tx_hash = _send_tx(route=route, nonce=nonce, max_fee=max_fee, priority_fee=priority_fee, gas=gas, value=value, config=config)
+    tx_hash = _send_tx(transfer=t, nonce=nonce, max_fee=max_fee, priority_fee=priority_fee, gas=gas, value=value, config=config)
     if tx_hash is None:
         return
 
     status = "UNKNOWN"
     if not cmd_params.skip_receipt:
-        logger.debug(f"{route.log_prefix}: waiting for receipt, tx_hash={tx_hash}")
+        logger.debug(f"{t.log_prefix}: waiting for receipt, tx_hash={tx_hash}")
         status = cli_utils.wait_tx_status(config.nodes, config.proxies, tx_hash, config.wait_tx_timeout)
 
-    logger.info(f"{route.log_prefix}: tx_hash={tx_hash}, value={_value_with_suffix(value, config)},  status={status}")
+    logger.info(f"{t.log_prefix}: tx_hash={tx_hash}, value={_value_with_suffix(value, config)},  status={status}")
 
 
-def _calc_value(route: TxRoute, max_fee: int, gas: int, config: Config) -> int | None:
+def _calc_value(transfer: Transfer, max_fee: int, gas: int, config: Config) -> int | None:
     if config.token:
         return rpc_helpers.calc_erc20_value_for_address(
             nodes=config.nodes,
-            value_expression=config.value,
-            wallet_address=route.from_address,
+            value_expression=transfer.value,
+            wallet_address=transfer.from_address,
             token_address=config.token,
             decimals=config.token_decimals,
-            log_prefix=route.log_prefix,
+            log_prefix=transfer.log_prefix,
         )
     return rpc_helpers.calc_eth_value_for_address(
         nodes=config.nodes,
-        value_expression=config.value,
-        address=route.from_address,
+        value_expression=transfer.value,
+        address=transfer.from_address,
         gas=gas,
         max_fee=max_fee,
-        log_prefix=route.log_prefix,
+        log_prefix=transfer.log_prefix,
     )
 
 
-def _check_value_min_limit(route: TxRoute, value: int, config: Config) -> bool:
+def _check_value_min_limit(transfer: Transfer, value: int, config: Config) -> bool:
     """Returns False if the transfer should be skipped."""
     if config.value_min_limit:
         if config.token:
@@ -178,21 +191,23 @@ def _check_value_min_limit(route: TxRoute, value: int, config: Config) -> bool:
         else:
             value_min_limit = calcs.calc_eth_expression(config.value_min_limit)
         if value < value_min_limit:
-            logger.info(f"{route.log_prefix}: value<value_min_limit, value={_value_with_suffix(value, config)}")
+            logger.info(f"{transfer.log_prefix}: value<value_min_limit, value={_value_with_suffix(value, config)}")
     return True
 
 
-def _send_tx(*, route: TxRoute, nonce: int, max_fee: int, priority_fee: int, gas: int, value: int, config: Config) -> str | None:
+def _send_tx(
+    *, transfer: Transfer, nonce: int, max_fee: int, priority_fee: int, gas: int, value: int, config: Config
+) -> str | None:
     debug_tx_params = {
         "nonce": nonce,
         "max_fee": max_fee,
         "priority_fee": priority_fee,
         "gas": gas,
         "value": value,
-        "to": route.to_address,
+        "to": transfer.to_address,
         "chain_id": config.chain_id,
     }
-    logger.debug(f"{route.log_prefix}: tx_params={debug_tx_params}")
+    logger.debug(f"{transfer.log_prefix}: tx_params={debug_tx_params}")
 
     if config.token:
         signed_tx = erc20.sign_transfer_tx(
@@ -200,11 +215,11 @@ def _send_tx(*, route: TxRoute, nonce: int, max_fee: int, priority_fee: int, gas
             max_fee_per_gas=max_fee,
             max_priority_fee_per_gas=priority_fee,
             gas_limit=gas,
-            private_key=config.private_keys[route.from_address],
+            private_key=config.private_keys[transfer.from_address],
             chain_id=config.chain_id,
             value=value,
             token_address=config.token,
-            recipient_address=route.to_address,
+            recipient_address=transfer.to_address,
         )
     else:
         signed_tx = sign_tx(
@@ -212,38 +227,46 @@ def _send_tx(*, route: TxRoute, nonce: int, max_fee: int, priority_fee: int, gas
             max_fee_per_gas=max_fee,
             max_priority_fee_per_gas=priority_fee,
             gas=gas,
-            private_key=config.private_keys[route.from_address],
+            private_key=config.private_keys[transfer.from_address],
             chain_id=config.chain_id,
             value=value,
-            to=route.to_address,
+            to=transfer.to_address,
         )
     res = rpc.eth_send_raw_transaction(config.nodes, signed_tx.raw_tx, attempts=5)
     if isinstance(res, Err):
-        logger.info(f"{route.log_prefix}: tx error {res.err}")
+        logger.info(f"{transfer.log_prefix}: tx error {res.err}")
         return None
     return res.ok
 
 
-def _calc_gas(route: TxRoute, config: Config) -> int | None:
+def _calc_gas(transfer: Transfer, config: Config) -> int | None:
     if config.token:
         return rpc_helpers.calc_gas(
             nodes=config.nodes,
             gas_expression=config.gas,
-            from_address=route.from_address,
+            from_address=transfer.from_address,
             to_address=config.token,
-            data=erc20.encode_transfer_input_data(route.to_address, 1234),
-            log_prefix=route.log_prefix,
+            data=erc20.encode_transfer_input_data(transfer.to_address, 1234),
+            log_prefix=transfer.log_prefix,
         )
     return rpc_helpers.calc_gas(
         nodes=config.nodes,
         gas_expression=config.gas,
-        from_address=route.from_address,
-        to_address=route.to_address,
+        from_address=transfer.from_address,
+        to_address=transfer.to_address,
         value=123,
-        log_prefix=route.log_prefix,
+        log_prefix=transfer.log_prefix,
     )
 
 
+def _print_transfers(config: Config) -> None:
+    table = Table("n", "from_address", "to_address", "value", title="transfers")
+    for count, transfer in enumerate(config.transfers, start=1):
+        table.add_row(str(count), transfer.from_address, transfer.to_address, transfer.value)
+    console = Console()
+    console.print(table)
+
+
 def _print_balances(config: Config) -> None:
     if config.token:
         headers = ["n", "from_address", "nonce", "eth", "t", "to_address", "nonce", "eth", "t"]
@@ -251,24 +274,24 @@ def _print_balances(config: Config) -> None:
         headers = ["n", "from_address", "nonce", "eth", "to_address", "nonce", "eth"]
     table = Table(*headers, title="balances")
     with Live(table, refresh_per_second=0.5):
-        for count, route in enumerate(config.routes):
-            from_nonce = _get_nonce_str(route.from_address, config)
-            to_nonce = _get_nonce_str(route.to_address, config)
+        for count, transfer in enumerate(config.transfers):
+            from_nonce = _get_nonce_str(transfer.from_address, config)
+            to_nonce = _get_nonce_str(transfer.to_address, config)
 
-            from_eth_balance = _get_eth_balance_str(route.from_address, config)
-            to_eth_balance = _get_eth_balance_str(route.to_address, config)
+            from_eth_balance = _get_eth_balance_str(transfer.from_address, config)
+            to_eth_balance = _get_eth_balance_str(transfer.to_address, config)
 
-            from_token_balance = _get_token_balance_str(route.from_address, config) if config.token else ""
-            to_token_balance = _get_token_balance_str(route.to_address, config) if config.token else ""
+            from_token_balance = _get_token_balance_str(transfer.from_address, config) if config.token else ""
+            to_token_balance = _get_token_balance_str(transfer.to_address, config) if config.token else ""
 
             if config.token:
                 table.add_row(
                     str(count),
-                    route.from_address,
+                    transfer.from_address,
                     from_nonce,
                     from_eth_balance,
                     from_token_balance,
-                    route.to_address,
+                    transfer.to_address,
                     to_nonce,
                     to_eth_balance,
                     to_token_balance,
@@ -276,10 +299,10 @@ def _print_balances(config: Config) -> None:
             else:
                 table.add_row(
                     str(count),
-                    route.from_address,
+                    transfer.from_address,
                     from_nonce,
                     from_eth_balance,
-                    route.to_address,
+                    transfer.to_address,
                     to_nonce,
                     to_eth_balance,
                 )

mm_eth/cli/examples/transfer.toml

@@ -1,6 +1,9 @@
-routes = """
-0x10fd602Bff689e64D4720D1DCCCD3494f1f16623 0x58487485c3858109f5A37e42546FE87473f79a4b
-0x97C77B548aE0d4925F5C201220fC6d8996424309 0x7EdF3b8579c21A8820b4C0B8352541c1CE04045f # can comment here
+transfers = """
+# from_address to_address value
+0x10fd602Bff689e64D4720D1DCCCD3494f1f16623 0x58487485c3858109f5A37e42546FE87473f79a4b 0.1t # comments are allowed here
+0x97C77B548aE0d4925F5C201220fC6d8996424309 0x7EdF3b8579c21A8820b4C0B8352541c1CE04045f 0.2balance-random(0.1t,0.5t)
+0x10ecB8d838746643E613f6B5218C8e342593225c 0xE19242B72a4833eD86F1b2015d4E59052A2b278b # if the value is not set, config.value will be used
+file: /path/to/other_transfers.txt # transfers from this file will be added
 """
 
 private_keys = """
@@ -11,19 +14,19 @@ file: /path/to/other_private_keys.txt
 
 token = "0x60631C856303731BE4deb81C0303F80B652aA5b4" # If not specified, it ETH transfers
 
-max_fee = "1.2base_fee + 1gwei + random(1,200)" # supported var_name=base_fee
+max_fee = "1.2base_fee+1gwei+random(1,200)" # supported var_name=base_fee
 
-max_fee_limit = "10.1gwei - random(1, 10)" # optional
+max_fee_limit = "10.1gwei-random(1,10)" # optional
 
-priority_fee = "1gwei + random(1, 12)"
+priority_fee = "1gwei+random(1,12)"
 
-gas = "estimate + random(100, 200) - 19" # supported var_name=estimate
+gas = "estimate+random(100,200)-19" # supported var_name=estimate
 
-value = "0.5balance - random(1.5t, 3t) + 11t" # supported var_name=balance. For ERC20 token use 't' suffix.
+value = "0.5balance-random(1.5t,3t)+11t" # supported var_name=balance. For ERC20 token use 't' suffix.
 
-value_min_limit = "0.5t + random(1, 2) - 7"
+value_min_limit = "0.5t+random(1,2)-7"
 
-delay = "random(1.123, 10) + 1" # secs, optional
+delay = "random(1.123,10)+1" # secs, optional
 
 log_debug = "/path/to/file_debug.log" # optional
 

mm_eth/cli/validators.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable
 
-from mm_crypto_utils import AddressToPrivate, ConfigValidators, TxRoute
+from mm_crypto_utils import AddressToPrivate, ConfigValidators, Transfer
 
 from mm_eth.account import address_from_private, is_address
 from mm_eth.constants import SUFFIX_DECIMALS
@@ -22,8 +22,8 @@ class Validators(ConfigValidators):
         return ConfigValidators.valid_calc_int_expression(var_name, SUFFIX_DECIMALS | {"t": 6})
 
     @staticmethod
-    def eth_routes() -> Callable[[str], list[TxRoute]]:
-        return ConfigValidators.routes(is_address, to_lower=True)
+    def eth_transfers() -> Callable[[str], list[Transfer]]:
+        return ConfigValidators.transfers(is_address, to_lower=True)
 
     @staticmethod
     def eth_private_keys() -> Callable[[str], AddressToPrivate]:

{mm_eth-0.4.1.dist-info → mm_eth-0.5.0.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: mm-eth
-Version: 0.4.1
+Version: 0.5.0
 Requires-Python: >=3.12
-Requires-Dist: mm-crypto-utils>=0.1.5
+Requires-Dist: mm-crypto-utils>=0.2.3
 Requires-Dist: typer>=0.15.1
 Requires-Dist: web3~=7.8.0
 Requires-Dist: websocket-client~=1.8.0

{mm_eth-0.4.1.dist-info → mm_eth-0.5.0.dist-info}/RECORD

@@ -16,11 +16,11 @@ mm_eth/utils.py,sha256=sSxt9GZEntZlT0RU8ht9Qon875HPhpd-1JjgqUBEfVo,7405
 mm_eth/vault.py,sha256=h8NyiOQh5YFskh1lZA3KyvnJUnxl9769ME2ChplG0CM,1477
 mm_eth/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_eth/cli/calcs.py,sha256=cLFTYNAN-I53tUiSg-zFfVr2afjIZPftDDjHj16FBz0,1068
-mm_eth/cli/cli.py,sha256=0UYDtNrCXvJqs836tPxsQHs7yTKjvAGL3qgWiXVhnDU,9208
+mm_eth/cli/cli.py,sha256=nSOxvfjEu6HBXz6qFOCuiLFgw381pzeNB2tUGxdJIgA,9332
 mm_eth/cli/cli_utils.py,sha256=yBIS3dGid75zyxw8crPOQHA4p3Krk5BoA2g01turKmQ,1712
 mm_eth/cli/print_helpers.py,sha256=yOiOFjTKloumwf07AqNIHQswUo8t0yuT9bpeGBGl60Q,1470
 mm_eth/cli/rpc_helpers.py,sha256=FMV-QVNM3v9X8H_-DP0hjNRqmm7KOnfzkw9bP17Qbz0,4499
-mm_eth/cli/validators.py,sha256=whnuA4CFkKbcNcbl4e2EwktTSTDGFBTA798E9F_3EM8,1682
+mm_eth/cli/validators.py,sha256=KIAQUohl4_KKDvynbeqIeywtNnMWhTKYlnTdaxcjn6U,1690
 mm_eth/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_eth/cli/cmd/balance_cmd.py,sha256=gkwUa8VGe1wXH0GDsit3-1NmRiijojaNLygi5zNcYSY,2110
 mm_eth/cli/cmd/balances_cmd.py,sha256=4UiWSNH9OCnkvcMGPTygEss8119do-rfG7QtsNMfWZs,4197
@@ -30,10 +30,9 @@ mm_eth/cli/cmd/encode_input_data_cmd.py,sha256=9UQ1MKPEFQJ8j_COsP3KGKhwOf9tT3feB
 mm_eth/cli/cmd/example_cmd.py,sha256=o4NTll3fjmspbKjZ0sHGDRHTZ1RcFNHZDi9Ka0VNoDQ,264
 mm_eth/cli/cmd/node_cmd.py,sha256=Ae5yPxxnNiHw3tZcojS7KwNLM4gEfLhsTfhZp_86rqU,1956
 mm_eth/cli/cmd/rpc_cmd.py,sha256=02q82YqgbPezfEBmV_QBCIeNReE7ktkPych8Xr9ann8,2186
-mm_eth/cli/cmd/send_contract_cmd.py,sha256=JX3L1Dz4CBySfa2Pf87E8grauPu0U6xIyyOus81285Y,7316
 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_cmd.py,sha256=nC1Jiqe6zDJQvK9xVhB8mCbkEB1ZgMZmA393tDnZ1Dw,12176
+mm_eth/cli/cmd/transfer_cmd.py,sha256=r8mZK9WyqXdR-Ce7Xb4hhOOHEKaJhPfbmYigC_4HzqU,13151
 mm_eth/cli/cmd/tx_cmd.py,sha256=PIenXYTT60Z2fqsivpzybCLI2Z_tlcz-asm3B0JLHgI,517
 mm_eth/cli/cmd/vault_cmd.py,sha256=MOM1CILIaaqown1I-Fgo22ckqIMLtFt8t2D3fWNp798,606
 mm_eth/cli/cmd/wallet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,8 +40,8 @@ mm_eth/cli/cmd/wallet/mnemonic_cmd.py,sha256=xE-5Ux9BdYsTZYBy0dMn9jupGhW4ced-AgY
 mm_eth/cli/cmd/wallet/private_key_cmd.py,sha256=Fv_2OLog1h32pIP7PJITwl_pHdy3BXvaDRcXZsxY1xo,241
 mm_eth/cli/examples/balances.toml,sha256=i_ALpiEcf8-0TFiUg1cgJhxxfHYeBl9x0b3tnUWjswU,421
 mm_eth/cli/examples/call_contract.toml,sha256=ZQWK-409V_vLIZ2bsRD5RCWPPzShPz2KJTTRQY4YaGw,248
-mm_eth/cli/examples/transfer.toml,sha256=HLVpkCNakZFE8qdFdDUoBPk7ZBdfEmk9TLZtooRsGAc,1198
-mm_eth-0.4.1.dist-info/METADATA,sha256=aMEeaP5awNBZ0ZhRIxmhTl1jennR_TAdETFamw4F9HU,207
-mm_eth-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_eth-0.4.1.dist-info/entry_points.txt,sha256=aGhpsozl8NIrkuUcX5fSgURCcDhr3ShUdeTSIrJq4oc,46
-mm_eth-0.4.1.dist-info/RECORD,,
+mm_eth/cli/examples/transfer.toml,sha256=OKpojNWV2DQ68hX8jQ84cAMevKmBt-l20ij3ROTO9G0,1463
+mm_eth-0.5.0.dist-info/METADATA,sha256=5vJwdr_CVo2u2CDobOUKNK2pnQi1sDksc2qQd9XBNaE,207
+mm_eth-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_eth-0.5.0.dist-info/entry_points.txt,sha256=aGhpsozl8NIrkuUcX5fSgURCcDhr3ShUdeTSIrJq4oc,46
+mm_eth-0.5.0.dist-info/RECORD,,

mm_eth/cli/cmd/send_contract_cmd.py

@@ -1,197 +0,0 @@
-import json
-import sys
-import time
-from pathlib import Path
-from typing import Annotated, Self
-
-import mm_crypto_utils
-from loguru import logger
-from mm_crypto_utils import AddressToPrivate
-from mm_std import BaseConfig, Err, Ok, utc_now
-from pydantic import AfterValidator, BeforeValidator, StrictStr, model_validator
-
-from mm_eth import abi, rpc
-from mm_eth.cli import calcs, cli_utils, print_helpers, rpc_helpers, validators
-from mm_eth.cli.calcs import calc_eth_expression
-from mm_eth.cli.cli_utils import BaseConfigParams
-from mm_eth.cli.validators import Validators
-from mm_eth.tx import sign_tx
-from mm_eth.utils import from_wei_str
-
-
-class Config(BaseConfig):
-    from_addresses: Annotated[list[str], BeforeValidator(Validators.eth_addresses(unique=True))]
-    contract_address: Annotated[str, BeforeValidator(Validators.eth_address())]
-    function_signature: str
-    function_args: StrictStr = "[]"
-    nodes: Annotated[list[str], BeforeValidator(Validators.nodes())]
-    chain_id: int
-    private_keys: Annotated[AddressToPrivate, BeforeValidator(Validators.eth_private_keys())]
-    max_fee: Annotated[str, AfterValidator(Validators.valid_eth_expression("base_fee"))]
-    priority_fee: Annotated[str, AfterValidator(Validators.valid_eth_expression())]
-    max_fee_limit: Annotated[str | None, AfterValidator(Validators.valid_eth_expression())] = None
-    value: Annotated[str, AfterValidator(Validators.valid_eth_expression("balance"))]  # eth value
-    gas: Annotated[str, AfterValidator(Validators.valid_eth_expression("estimate"))]
-    delay: Annotated[str | None, AfterValidator(Validators.valid_calc_decimal_value())] = None  # in seconds
-    round_ndigits: int = 5
-    log_debug: Annotated[Path | None, BeforeValidator(Validators.log_file())] = None
-    log_info: Annotated[Path | None, BeforeValidator(Validators.log_file())] = None
-
-    # noinspection DuplicatedCode
-    @model_validator(mode="after")
-    def final_validator(self) -> Self:
-        # check all private keys exist
-        if not self.private_keys.contains_all_addresses(self.from_addresses):
-            raise ValueError("private keys are not set for all addresses")
-
-        # check that from_addresses is not empty
-        if not self.from_addresses:
-            raise ValueError("from_addresses is empty")
-
-        # function_args
-        if not validators.is_valid_calc_function_args(self.function_args):
-            raise ValueError(f"wrong function_args: {self.function_args}")
-
-        return self
-
-
-class SendContractCmdParams(BaseConfigParams):
-    print_balances: bool
-    debug: bool
-    no_receipt: bool
-    emulate: bool
-
-
-# noinspection DuplicatedCode
-def run(cli_params: SendContractCmdParams) -> None:
-    config = Config.read_toml_config_or_exit(cli_params.config_path)
-    if cli_params.print_config:
-        config.print_and_exit({"private_key"})
-
-    mm_crypto_utils.init_logger(cli_params.debug, config.log_debug, config.log_info)
-
-    rpc_helpers.check_nodes_for_chain_id(config.nodes, config.chain_id)
-
-    if cli_params.print_balances:
-        print_helpers.print_balances(config.nodes, config.from_addresses, round_ndigits=config.round_ndigits)
-        sys.exit(0)
-
-    _run_transfers(config, cli_params)
-
-
-# noinspection DuplicatedCode
-def _run_transfers(config: Config, cli_params: SendContractCmdParams) -> None:
-    logger.info(f"started at {utc_now()} UTC")
-    logger.debug(f"config={config.model_dump(exclude={'private_keys'}) | {'version': cli_utils.get_version()}}")
-    for i, from_address in enumerate(config.from_addresses):
-        _transfer(from_address, config, cli_params)
-        if not cli_params.emulate and config.delay is not None and i < len(config.from_addresses) - 1:
-            delay_value = mm_crypto_utils.calc_decimal_value(config.delay)
-            logger.debug(f"delay {delay_value} seconds")
-            time.sleep(float(delay_value))
-    logger.info(f"finished at {utc_now()} UTC")
-
-
-# noinspection DuplicatedCode
-def _transfer(from_address: str, config: Config, cli_params: SendContractCmdParams) -> None:
-    log_prefix = f"{from_address}"
-    # get nonce
-    nonce = rpc_helpers.get_nonce(config.nodes, from_address, log_prefix)
-    if nonce is None:
-        return
-
-    # get max_fee
-    max_fee = rpc_helpers.calc_max_fee(config.nodes, config.max_fee, log_prefix)
-    if max_fee is None:
-        return
-
-    # check max_fee_limit
-    if rpc_helpers.is_max_fee_limit_exceeded(max_fee, config.max_fee_limit, log_prefix):
-        return
-
-    priority_fee = calc_eth_expression(config.priority_fee)
-
-    # data
-    function_args = calcs.calc_function_args(config.function_args).replace("'", '"')
-    data = abi.encode_function_input_by_signature(config.function_signature, json.loads(function_args))
-
-    # get gas
-    gas = rpc_helpers.calc_gas(
-        nodes=config.nodes,
-        gas_expression=config.gas,
-        from_address=from_address,
-        to_address=config.contract_address,
-        value=None,
-        data=data,
-        log_prefix=log_prefix,
-    )
-    if gas is None:
-        return
-
-    # get value
-    value = None
-    if config.value is not None:
-        value = rpc_helpers.calc_eth_value_for_address(
-            nodes=config.nodes,
-            value_expression=config.value,
-            address=from_address,
-            gas=gas,
-            max_fee=max_fee,
-            log_prefix=log_prefix,
-        )
-        if value is None:
-            return
-
-    # emulate?
-    if cli_params.emulate:
-        msg = f"{log_prefix}: emulate,"
-        if value is not None:
-            msg += f" value={from_wei_str(value, 'eth', config.round_ndigits)},"
-        msg += f" max_fee={from_wei_str(max_fee, 'gwei', config.round_ndigits)},"
-        msg += f" priority_fee={from_wei_str(priority_fee, 'gwei', config.round_ndigits)},"
-        msg += f" gas={gas}, "
-        msg += f" data={data}"
-        logger.info(msg)
-        return
-
-    debug_tx_params = {
-        "nonce": nonce,
-        "max_fee": max_fee,
-        "priority_fee": priority_fee,
-        "gas": gas,
-        "value": value,
-        "data": data,
-        "to": config.contract_address,
-        "chain_id": config.chain_id,
-    }
-    logger.debug(f"{log_prefix}: tx_params={debug_tx_params}")
-    signed_tx = sign_tx(
-        nonce=nonce,
-        max_fee_per_gas=max_fee,
-        max_priority_fee_per_gas=priority_fee,
-        gas=gas,
-        private_key=config.private_keys[from_address],
-        chain_id=config.chain_id,
-        value=value,
-        data=data,
-        to=config.contract_address,
-    )
-    res = rpc.eth_send_raw_transaction(config.nodes, signed_tx.raw_tx, attempts=5)
-    if isinstance(res, Err):
-        logger.info(f"{log_prefix}: send_error: {res.err}")
-        return
-    tx_hash = res.ok
-
-    if cli_params.no_receipt:
-        msg = f"{log_prefix}: tx_hash={tx_hash}"
-        logger.info(msg)
-    else:
-        logger.debug(f"{log_prefix}: tx_hash={tx_hash}, wait receipt")
-        while True:  # TODO: infinite loop if receipt_res is err
-            receipt_res = rpc.get_tx_status(config.nodes, tx_hash)
-            if isinstance(receipt_res, Ok):
-                status = "OK" if receipt_res.ok == 1 else "FAIL"
-                msg = f"{log_prefix}: tx_hash={tx_hash}, status={status}"
-                logger.info(msg)
-                break
-            time.sleep(1)