mm-eth 0.3.1__tar.gz → 0.4.1__tar.gz

{mm_eth-0.3.1 → mm_eth-0.4.1}/PKG-INFO

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

{mm_eth-0.3.1 → mm_eth-0.4.1}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "mm-eth"
-version = "0.3.1"
+version = "0.4.1"
 description = ""
 requires-python = ">=3.12"
 dependencies = [
-    "mm-crypto-utils>=0.1.4",
+    "mm-crypto-utils>=0.1.5",
     "websocket-client~=1.8.0",
-    "web3~=7.7.0",
+    "web3~=7.8.0",
     "typer>=0.15.1",
 ]
 [project.scripts]
@@ -20,11 +20,11 @@ build-backend = "hatchling.build"
 dev-dependencies = [
     "pytest~=8.3.4",
     "pytest-xdist~=3.6.1",
-    "ruff~=0.9.4",
+    "ruff~=0.9.5",
     "pip-audit~=2.7.3",
     "bandit~=1.8.2",
-    "mypy~=1.14.1",
-    "types-PyYAML~=6.0.12.20241230",
+    "mypy~=1.15.0",
+    "types-pyyaml>=6.0.12.20241230",
 ]
 
 [tool.mypy]

{mm_eth-0.3.1 → mm_eth-0.4.1}/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.1/src/mm_eth/cli/calcs.py

@@ -0,0 +1,27 @@
+import random
+
+import mm_crypto_utils
+from mm_crypto_utils import VarInt
+
+from mm_eth.constants import SUFFIX_DECIMALS
+
+
+def calc_eth_expression(expression: str, var: VarInt | None = None) -> int:
+    return mm_crypto_utils.calc_int_expression(expression, var=var, suffix_decimals=SUFFIX_DECIMALS)
+
+
+def calc_token_expression(expression: str, token_decimals: int, var: VarInt | None = None) -> int:
+    return mm_crypto_utils.calc_int_expression(expression, var=var, suffix_decimals={"t": token_decimals})
+
+
+def calc_function_args(value: str) -> str:
+    while True:
+        if "random(" not in value:
+            return value
+        start_index = value.index("random(")
+        stop_index = value.index(")", start_index)
+        random_range = [int(v.strip()) for v in value[start_index + 7 : stop_index].split(",")]
+        if len(random_range) != 2:
+            raise ValueError("wrong random(from,to) template")
+        rand_value = str(random.randint(random_range[0], random_range[1]))
+        value = value[0:start_index] + rand_value + value[stop_index + 1 :]

{mm_eth-0.3.1 → mm_eth-0.4.1}/src/mm_eth/cli/cli.py

@@ -5,23 +5,22 @@ 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,
     balances_cmd,
     call_contract_cmd,
-    config_example_cmd,
     deploy_cmd,
     encode_input_data_cmd,
-    mnemonic_cmd,
+    example_cmd,
     node_cmd,
-    private_key_cmd,
     rpc_cmd,
     send_contract_cmd,
     solc_cmd,
     token_cmd,
-    transfer_erc20_cmd,
-    transfer_eth_cmd,
+    transfer_cmd,
     tx_cmd,
     vault_cmd,
 )
@@ -29,8 +28,8 @@ 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_erc20_cmd import TransferErc20CmdParams
-from .cmd.transfer_eth_cmd import TransferEthCmdParams
+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)
 
@@ -40,8 +39,7 @@ app.add_typer(wallet_app, name="w", hidden=True)
 
 
 class ConfigExample(str, Enum):
-    TRANSFER_ETH = "transfer-eth"
-    TRANSFER_ERC20 = "transfer-erc20"
+    TRANSFER = "transfer"
     BALANCES = "balances"
     CALL_CONTRACT = "call-contract"
 
@@ -77,9 +75,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:
@@ -88,7 +87,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,
     )
 
@@ -141,43 +141,24 @@ def tx_command(
     tx_cmd.run(rpc_url, tx_hash, get_receipt)
 
 
-@app.command(name="transfer-eth", help="Transfer eth / base token from one or many accounts")
-def transfer_eth_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:
-    transfer_eth_cmd.run(
-        TransferEthCmdParams(
-            config_path=config_path,
-            print_balances=print_balances,
-            print_config_and_exit=print_config,
-            debug=debug,
-            no_receipt=no_receipt,
-            emulate=emulate,
-        )
-    )
-
-
-@app.command(name="transfer-erc20", help="Transfer ERC20 token from one or many accounts")
-def transfer_erc20_command(
+@app.command(
+    name="transfer", help="Transfers ETH or ERC20 tokens, supporting multiple routes, delays, and expression-based values"
+)
+def transfer_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"),
+    skip_receipt: bool = typer.Option(False, "--skip-receipt", help="Don't wait for a tx receipt"),
     debug: bool = typer.Option(False, "--debug", "-d", help="Print debug info"),
 ) -> None:
-    transfer_erc20_cmd.run(
-        TransferErc20CmdParams(
+    transfer_cmd.run(
+        TransferCmdParams(
             config_path=config_path,
             print_balances=print_balances,
-            print_config_and_exit=print_config,
+            print_config=print_config,
             debug=debug,
-            no_receipt=no_receipt,
+            skip_receipt=skip_receipt,
             emulate=emulate,
         )
     )
@@ -196,7 +177,7 @@ def send_contract_command(
         SendContractCmdParams(
             config_path=config_path,
             print_balances=print_balances,
-            print_config_and_exit=print_config,
+            print_config=print_config,
             debug=debug,
             no_receipt=no_receipt,
             emulate=emulate,
@@ -211,7 +192,7 @@ def balances_command(
     nonce: bool = typer.Option(False, "--nonce", "-n", help="Print nonce also"),
     wei: bool = typer.Option(False, "--wei", "-w", help="Show balances in WEI"),
 ) -> None:
-    balances_cmd.run(BalancesCmdParams(config_path=config_path, print_config_and_exit=print_config, wei=wei, show_nonce=nonce))
+    balances_cmd.run(BalancesCmdParams(config_path=config_path, print_config=print_config, wei=wei, show_nonce=nonce))
 
 
 @app.command(name="call-contract", help="Call a method on a contract")
@@ -219,7 +200,7 @@ def call_contract_command(
     config_path: Path,
     print_config: bool = typer.Option(False, "--config", "-c", help="Print config and exit"),
 ) -> None:
-    call_contract_cmd.run(CallContractCmdParams(config_path=config_path, print_config_and_exit=print_config))
+    call_contract_cmd.run(CallContractCmdParams(config_path=config_path, print_config=print_config))
 
 
 @app.command(name="deploy", help="Deploy a smart contract onchain")
@@ -227,12 +208,12 @@ def deploy_command(
     config_path: Path,
     print_config: bool = typer.Option(False, "--config", "-c", help="Print config and exit"),
 ) -> None:
-    deploy_cmd.run(DeployCmdParams(config_path=config_path, print_config_and_exit=print_config))
+    deploy_cmd.run(DeployCmdParams(config_path=config_path, print_config=print_config))
 
 
-@app.command(name="config-example", help="Print an example of config for a command")
-def config_example_command(command: Annotated[ConfigExample, typer.Argument()]) -> None:
-    config_example_cmd.run(command)
+@app.command(name="example", help="Displays an example configuration for a command")
+def example_command(command: Annotated[ConfigExample, typer.Argument()]) -> None:
+    example_cmd.run(command)
 
 
 @app.command(name="encode-input-data", help="Encode input data by a function signature")

mm_eth-0.4.1/src/mm_eth/cli/cli_utils.py

@@ -0,0 +1,60 @@
+import importlib.metadata
+import time
+from pathlib import Path
+from typing import Literal
+
+from mm_crypto_utils import Nodes, Proxies
+from mm_std import BaseConfig, print_json
+from pydantic import BaseModel
+
+from mm_eth import rpc
+
+
+def get_version() -> str:
+    return importlib.metadata.version("mm-eth")
+
+
+def public_rpc_url(url: str | None) -> str:
+    if not url or url == "1":
+        return "https://ethereum.publicnode.com"
+    if url.startswith(("http://", "https://", "ws://", "wss://")):
+        return url
+
+    match url.lower():
+        case "mainnet" | "1":
+            return "https://ethereum.publicnode.com"
+        case "opbnb" | "204":
+            return "https://opbnb-mainnet-rpc.bnbchain.org"
+        case "base" | "8453":
+            return "https://mainnet.base.org"
+        case "base-sepolia" | "84532":
+            return "https://sepolia.base.org"
+        case _:
+            return url
+
+
+class BaseConfigParams(BaseModel):
+    config_path: Path
+    print_config: bool
+
+
+def print_config(config: BaseConfig, exclude: set[str] | None = None, count: set[str] | None = None) -> None:
+    data = config.model_dump(exclude=exclude)
+    if count:
+        for k in count:
+            data[k] = len(data[k])
+    print_json(data)
+
+
+def wait_tx_status(nodes: Nodes, proxies: Proxies, tx_hash: str, timeout: int) -> Literal["OK", "FAIL", "TIMEOUT"]:
+    started_at = time.perf_counter()
+    count = 0
+    while True:
+        res = rpc.get_tx_status(nodes, tx_hash, proxies=proxies, attempts=5)
+        if res.is_ok():
+            return "OK" if res.ok == 1 else "FAIL"
+
+        time.sleep(1)
+        count += 1
+        if time.perf_counter() - started_at > timeout:
+            return "TIMEOUT"

{mm_eth-0.3.1 → mm_eth-0.4.1}/src/mm_eth/cli/cmd/balances_cmd.py

@@ -33,7 +33,7 @@ class BalancesCmdParams(BaseConfigParams):
 
 def run(params: BalancesCmdParams) -> None:
     config = Config.read_toml_config_or_exit(params.config_path)
-    if params.print_config_and_exit:
+    if params.print_config:
         config.print_and_exit()
 
     tokens = _get_tokens_info(config)

{mm_eth-0.3.1 → mm_eth-0.4.1}/src/mm_eth/cli/cmd/call_contract_cmd.py

@@ -22,7 +22,7 @@ class CallContractCmdParams(BaseConfigParams):
 
 def run(cli_params: CallContractCmdParams) -> None:
     config = Config.read_toml_config_or_exit(cli_params.config_path)
-    if cli_params.print_config_and_exit:
+    if cli_params.print_config:
         config.print_and_exit()
 
     input_data = abi.encode_function_input_by_signature(

{mm_eth-0.3.1 → mm_eth-0.4.1}/src/mm_eth/cli/cmd/deploy_cmd.py

@@ -27,7 +27,7 @@ class DeployCmdParams(BaseConfigParams):
 
 def run(cli_params: DeployCmdParams) -> None:
     config = Config.read_toml_config_or_exit(cli_params.config_path)
-    if cli_params.print_config_and_exit:
+    if cli_params.print_config:
         config.print_and_exit({"private_key"})
 
     constructor_types = yaml.full_load(config.constructor_types)

mm_eth-0.3.1/src/mm_eth/cli/cmd/config_example_cmd.py → mm_eth-0.4.1/src/mm_eth/cli/cmd/example_cmd.py

@@ -5,5 +5,5 @@ from mm_std import print_plain
 
 def run(command: str) -> None:
     command = command.replace("-", "_")
-    example_file = Path(Path(__file__).parent.absolute(), "../config_examples", f"{command}.toml")
+    example_file = Path(Path(__file__).parent.absolute(), "../examples", f"{command}.toml")
     print_plain(example_file.read_text())

{mm_eth-0.3.1 → mm_eth-0.4.1}/src/mm_eth/cli/cmd/send_contract_cmd.py

@@ -65,7 +65,7 @@ class SendContractCmdParams(BaseConfigParams):
 # noinspection DuplicatedCode
 def run(cli_params: SendContractCmdParams) -> None:
     config = Config.read_toml_config_or_exit(cli_params.config_path)
-    if cli_params.print_config_and_exit:
+    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)