mm-eth 0.4.0__tar.gz → 0.5.0__tar.gz

{mm_eth-0.4.0 → mm_eth-0.5.0}/.gitignore

@@ -1,3 +1,4 @@
+.vscode
 .idea
 .venv
 .env

{mm_eth-0.4.0 → mm_eth-0.5.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: mm-eth
-Version: 0.4.0
+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.0 → mm_eth-0.5.0}/dict.dic

@@ -5,3 +5,4 @@ sepolia
 nosec
 goerli
 arbitrum
+sedes

{mm_eth-0.4.0 → mm_eth-0.5.0}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "mm-eth"
-version = "0.4.0"
+version = "0.5.0"
 description = ""
 requires-python = ">=3.12"
 dependencies = [
-    "mm-crypto-utils>=0.1.5",
+    "mm-crypto-utils>=0.2.3",
     "websocket-client~=1.8.0",
     "web3~=7.8.0",
     "typer>=0.15.1",
@@ -21,7 +21,7 @@ dev-dependencies = [
     "pytest~=8.3.4",
     "pytest-xdist~=3.6.1",
     "ruff~=0.9.5",
-    "pip-audit~=2.7.3",
+    "pip-audit~=2.8.0",
     "bandit~=1.8.2",
     "mypy~=1.15.0",
     "types-pyyaml>=6.0.12.20241230",

{mm_eth-0.4.0 → mm_eth-0.5.0}/src/mm_eth/account.py

@@ -13,9 +13,12 @@ Account.enable_unaudited_hdwallet_features()
 
 key_api = KeyAPI()
 
+DEFAULT_DERIVATION_PATH = "m/44'/60'/0'/0/{i}"
+
 
 @dataclass
-class NewAccount:
+class DerivedAccount:
+    index: int
     path: str
     address: str
     private_key: str
@@ -30,18 +33,15 @@ def generate_mnemonic(num_words: int = 24) -> str:
     return mnemonic.generate(num_words=num_words)
 
 
-def generate_accounts(  # nosec
-    mnemonic: str,
-    passphrase: str = "",
-    path_prefix: str = "m/44'/60'/0'/0",
-    limit: int = 12,
-) -> list[NewAccount]:
-    result: list[NewAccount] = []
+def derive_accounts(mnemonic: str, passphrase: str, derivation_path: str, limit: int) -> list[DerivedAccount]:
+    if "{i}" not in derivation_path:
+        raise ValueError("derivation_path must contain {i}, for example: " + DEFAULT_DERIVATION_PATH)
+    result: list[DerivedAccount] = []
     for i in range(limit):
-        path = f"{path_prefix}/{i}"
-        acc = Account.from_mnemonic(mnemonic=mnemonic, account_path=path, passphrase=passphrase)
+        path = derivation_path.replace("{i}", str(i))
+        acc = Account.from_mnemonic(mnemonic, passphrase, path)
         private_key = acc.key.to_0x_hex().lower()
-        result.append(NewAccount(path, acc.address, private_key))
+        result.append(DerivedAccount(i, path, acc.address, private_key))
     return result
 
 

{mm_eth-0.4.0 → mm_eth-0.5.0}/src/mm_eth/cli/cli.py

@@ -5,6 +5,8 @@ from typing import Annotated
 import typer
 from mm_std import PrintFormat, print_plain
 
+from mm_eth.account import DEFAULT_DERIVATION_PATH
+
 from . import cli_utils
 from .cmd import (
     balance_cmd,
@@ -13,11 +15,8 @@ from .cmd import (
     deploy_cmd,
     encode_input_data_cmd,
     example_cmd,
-    mnemonic_cmd,
     node_cmd,
-    private_key_cmd,
     rpc_cmd,
-    send_contract_cmd,
     solc_cmd,
     token_cmd,
     transfer_cmd,
@@ -27,8 +26,8 @@ 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
 
 app = typer.Typer(no_args_is_help=True, pretty_exceptions_enable=False, add_completion=False)
 
@@ -74,9 +73,10 @@ def node_command(
 @wallet_app.command(name="mnemonic", help="Generate eth accounts based on a mnemonic")
 def mnemonic_command(  # nosec
     mnemonic: Annotated[str, typer.Option("--mnemonic", "-m")] = "",
-    passphrase: Annotated[str, typer.Option("--passphrase", "-pass")] = "",
+    passphrase: Annotated[str, typer.Option("--passphrase", "-p")] = "",
     print_path: bool = typer.Option(False, "--print_path"),
-    path_prefix: Annotated[str, typer.Option("--path")] = "m/44'/60'/0'/0",
+    derivation_path: Annotated[str, typer.Option("--path")] = DEFAULT_DERIVATION_PATH,
+    words: int = typer.Option(12, "--words", "-w", help="Number of mnemonic words"),
     limit: int = typer.Option(10, "--limit", "-l"),
     save_file: str = typer.Option("", "--save", "-s", help="Save private keys to a file"),
 ) -> None:
@@ -85,7 +85,8 @@ def mnemonic_command(  # nosec
         passphrase=passphrase,
         print_path=print_path,
         limit=limit,
-        path_prefix=path_prefix,
+        words=words,
+        derivation_path=derivation_path,
         save_file=save_file,
     )
 
@@ -144,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"),
@@ -153,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,
@@ -161,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-0.4.0 → mm_eth-0.5.0}/src/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-0.4.0/src/mm_eth/cli/cmd → mm_eth-0.5.0/src/mm_eth/cli/cmd/wallet}/mnemonic_cmd.py

@@ -3,18 +3,18 @@ from typing import Any
 
 from mm_std import print_json
 
-from mm_eth.account import generate_accounts, generate_mnemonic
+from mm_eth.account import derive_accounts, generate_mnemonic
 
 
-def run(mnemonic: str, passphrase: str, limit: int, print_path: bool, path_prefix: str, save_file: str) -> None:  # nosec
+def run(mnemonic: str, passphrase: str, words: int, derivation_path: str, limit: int, print_path: bool, save_file: str) -> None:  # nosec
     result: dict[str, Any] = {}
     if not mnemonic:
-        mnemonic = generate_mnemonic()
+        mnemonic = generate_mnemonic(num_words=words)
     result["mnemonic"] = mnemonic
     if passphrase:
         result["passphrase"] = passphrase
     result["accounts"] = []
-    for acc in generate_accounts(mnemonic=mnemonic, passphrase=passphrase, limit=limit, path_prefix=path_prefix):
+    for acc in derive_accounts(mnemonic=mnemonic, passphrase=passphrase, limit=limit, derivation_path=derivation_path):
         new_account = {"address": acc.address, "private": acc.private_key}
         if print_path:
             new_account["path"] = acc.path

mm_eth-0.5.0/src/mm_eth/cli/examples/transfer.toml

@@ -0,0 +1,42 @@
+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 = """
+0x7bb5b9c0ba991275f84b796b4d25fd3a8d7320911f50fade85410e7a2b000632
+0xb7e0b671e176b04ceb0897a698d34771bfe9acf29273dc52a141be6e97145a00
+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_limit = "10.1gwei-random(1,10)" # optional
+
+priority_fee = "1gwei+random(1,12)"
+
+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_min_limit = "0.5t+random(1,2)-7"
+
+delay = "random(1.123,10)+1" # secs, optional
+
+log_debug = "/path/to/file_debug.log" # optional
+
+log_info = "/path/to/file_info.log" # optional
+
+round_ndigits = 6 # optional, default=5
+
+chain_id = 421613
+
+nodes = """
+https://arbitrum-goerli.publicnode.com
+https://rpc.goerli.arbitrum.gateway.fm
+"""

{mm_eth-0.4.0 → mm_eth-0.5.0}/src/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.0 → mm_eth-0.5.0}/tests/test_account.py

@@ -1,4 +1,5 @@
 from mm_eth import account
+from mm_eth.account import DEFAULT_DERIVATION_PATH
 
 
 def test_generate_mnemonic():
@@ -8,7 +9,14 @@ def test_generate_mnemonic():
 
 
 def test_generate_accounts():
-    assert len(account.generate_accounts(account.generate_mnemonic(), limit=17)) == 17
+    mnemonic = "tuition skin amateur sail oak bone panel concert horse need panel balance"
+    passphrase = "pass-secret"
+    res = account.derive_accounts(mnemonic, passphrase, DEFAULT_DERIVATION_PATH, 7)
+    assert len(res) == 7
+    assert res[3].index == 3
+    assert res[3].path == "m/44'/60'/0'/0/3"
+    assert res[3].address == "0x2F9e1b9f4D11756E84d4b6D2f6B107FA37feB701"
+    assert res[3].private_key == "0x7b222a59ac8496b4f1f623bc86d15e889af8406f796037888ddee1290b933183"
 
 
 def test_to_checksum_address():

{mm_eth-0.4.0 → mm_eth-0.5.0}/uv.lock

@@ -602,19 +602,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d5/34/e8b383f35b77c402d28563d2b8f83159319b509bc5f760b15d60b0abf165/hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c", size = 32611 },
 ]
 
-[[package]]
-name = "html5lib"
-version = "1.1"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "six" },
-    { name = "webencodings" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/ac/b6/b55c3f49042f1df3dcd422b7f224f939892ee94f22abcf503a9b7339eaf2/html5lib-1.1.tar.gz", hash = "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f", size = 272215 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/6c/dd/a834df6482147d48e225a49515aabc28974ad5a4ca3215c18a882565b028/html5lib-1.1-py2.py3-none-any.whl", hash = "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d", size = 112173 },
-]
-
 [[package]]
 name = "httpcore"
 version = "1.0.7"
@@ -726,19 +713,19 @@ wheels = [
 
 [[package]]
 name = "mm-crypto-utils"
-version = "0.1.5"
+version = "0.2.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "loguru" },
     { name = "mm-std" },
 ]
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/2f/81/65963aa5b653b33c69235a9f5cb2d3a0b29d1e985a9325782d9ddad94ec7/mm_crypto_utils-0.1.5-py3-none-any.whl", hash = "sha256:3ee4d35c5f6d2cf6c4d9b192992be75abf8b6afd477528857021f5d958ce5779", size = 7779 },
+    { url = "https://files.pythonhosted.org/packages/78/dd/3cb0ddc4ab14a78a0e828fd1f7ca97298be8eff67b53b6198853e2013976/mm_crypto_utils-0.2.3-py3-none-any.whl", hash = "sha256:33ca42ef22c847c6f92973d7c799460926ee5c5bd7c872d3c7d19f31377e8833", size = 8257 },
 ]
 
 [[package]]
 name = "mm-eth"
-version = "0.4.0"
+version = "0.5.0"
 source = { editable = "." }
 dependencies = [
     { name = "mm-crypto-utils" },
@@ -760,7 +747,7 @@ dev = [
 
 [package.metadata]
 requires-dist = [
-    { name = "mm-crypto-utils", specifier = ">=0.1.5" },
+    { name = "mm-crypto-utils", specifier = ">=0.2.3" },
     { name = "typer", specifier = ">=0.15.1" },
     { name = "web3", specifier = "~=7.8.0" },
     { name = "websocket-client", specifier = "~=1.8.0" },
@@ -770,7 +757,7 @@ requires-dist = [
 dev = [
     { name = "bandit", specifier = "~=1.8.2" },
     { name = "mypy", specifier = "~=1.15.0" },
-    { name = "pip-audit", specifier = "~=2.7.3" },
+    { name = "pip-audit", specifier = "~=2.8.0" },
     { name = "pytest", specifier = "~=8.3.4" },
     { name = "pytest-xdist", specifier = "~=3.6.1" },
     { name = "ruff", specifier = "~=0.9.5" },
@@ -959,22 +946,22 @@ wheels = [
 
 [[package]]
 name = "pip-audit"
-version = "2.7.3"
+version = "2.8.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "cachecontrol", extra = ["filecache"] },
     { name = "cyclonedx-python-lib" },
-    { name = "html5lib" },
     { name = "packaging" },
     { name = "pip-api" },
     { name = "pip-requirements-parser" },
+    { name = "platformdirs" },
     { name = "requests" },
     { name = "rich" },
     { name = "toml" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/46/2f/d030d0d3a50b776f910dd87dc1d57dd4a27bfad176b85882f463632e4747/pip_audit-2.7.3.tar.gz", hash = "sha256:08891bbf179bffe478521f150818112bae998424f58bf9285c0078965aef38bc", size = 50365 }
+sdist = { url = "https://files.pythonhosted.org/packages/e8/c8/44ccea85bd2024f1ebe55eb6cdaf1f2183359176689eed3c0b01926c24ad/pip_audit-2.8.0.tar.gz", hash = "sha256:9816cbd94de6f618a8965c117433006b3d565a708dc05d5a7be47ab65b66fa05", size = 51073 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/4d/4a/c908ec8a527698a6539b431d70454e18aef04d4190ff48107ed4d3df99ff/pip_audit-2.7.3-py3-none-any.whl", hash = "sha256:46a11faee3323f76adf7987de8171daeb660e8f57d8088cc27fb1c1e5c7747b0", size = 56266 },
+    { url = "https://files.pythonhosted.org/packages/11/0c/be5c42643284b2cfc5d9d36b576b7465268a163bd7df481a3979a3d87a0b/pip_audit-2.8.0-py3-none-any.whl", hash = "sha256:200f50d56cb6fba3a9189c20d53250354f72f161d63b6ef77ae5de2b53044566", size = 57002 },
 ]
 
 [[package]]
@@ -990,6 +977,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/54/d0/d04f1d1e064ac901439699ee097f58688caadea42498ec9c4b4ad2ef84ab/pip_requirements_parser-32.0.1-py3-none-any.whl", hash = "sha256:4659bc2a667783e7a15d190f6fccf8b2486685b6dba4c19c3876314769c57526", size = 35648 },
 ]
 
+[[package]]
+name = "platformdirs"
+version = "4.3.6"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/13/fc/128cc9cb8f03208bdbf93d3aa862e16d376844a14f9a0ce5cf4507372de4/platformdirs-4.3.6.tar.gz", hash = "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", size = 21302 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/3c/a6/bc1012356d8ece4d66dd75c4b9fc6c1f6650ddd5991e421177d9f8f671be/platformdirs-4.3.6-py3-none-any.whl", hash = "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb", size = 18439 },
+]
+
 [[package]]
 name = "pluggy"
 version = "1.5.0"
@@ -1359,15 +1355,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/e0/f9/0595336914c5619e5f28a1fb793285925a8cd4b432c9da0a987836c7f822/shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686", size = 9755 },
 ]
 
-[[package]]
-name = "six"
-version = "1.16.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", size = 34041 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254", size = 11053 },
-]
-
 [[package]]
 name = "sniffio"
 version = "1.3.1"
@@ -1504,15 +1491,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b0/52/bc4a08811db59392e13bf56ada316517a83b9a6135c20d357c222c80be2d/web3-7.8.0-py3-none-any.whl", hash = "sha256:c8771b3d8772f7104a0462804449beb57d36cef7bd8b411140f95a92fc46b559", size = 1363475 },
 ]
 
-[[package]]
-name = "webencodings"
-version = "0.5.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923", size = 9721 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/f4/24/2a3e3df732393fed8b3ebf2ec078f05546de641fe1b667ee316ec1dcf3b7/webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", size = 11774 },
-]
-
 [[package]]
 name = "websocket-client"
 version = "1.8.0"

mm_eth-0.4.0/src/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)

mm_eth-0.4.0/src/mm_eth/cli/examples/transfer.toml

@@ -1,39 +0,0 @@
-routes = """
-0x10fd602Bff689e64D4720D1DCCCD3494f1f16623 0x58487485c3858109f5A37e42546FE87473f79a4b
-0x97C77B548aE0d4925F5C201220fC6d8996424309 0x7EdF3b8579c21A8820b4C0B8352541c1CE04045f # can comment here
-"""
-
-private_keys = """
-0x7bb5b9c0ba991275f84b796b4d25fd3a8d7320911f50fade85410e7a2b000632
-0xb7e0b671e176b04ceb0897a698d34771bfe9acf29273dc52a141be6e97145a00
-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_limit = "10.1gwei - random(1, 10)" # optional
-
-priority_fee = "1gwei + random(1, 12)"
-
-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_min_limit = "0.5t + random(1, 2) - 7"
-
-delay = "random(1.123, 10) + 1" # secs, optional
-
-log_debug = "/path/to/file_debug.log" # optional
-
-log_info = "/path/to/file_info.log" # optional
-
-round_ndigits = 6 # optional, default=5
-
-chain_id = 421613
-
-nodes = """
-https://arbitrum-goerli.publicnode.com
-https://rpc.goerli.arbitrum.gateway.fm
-"""