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

mm_eth/cli/cli.py

@@ -53,6 +53,16 @@ def balance_command(
     balance_cmd.run(rpc_url, wallet_address, token_address, wei, print_format)
 
 
+@app.command(name="balances", help="Print base and ERC20 token balances")
+def balances_command(
+    config_path: Path,
+    print_config: bool = typer.Option(False, "--config", "-c", help="Print config and exit"),
+    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=print_config, wei=wei, show_nonce=nonce))
+
+
 @app.command(name="token", help="Get token info")
 def token_command(
     token_address: Annotated[str, typer.Argument()],
@@ -64,10 +74,10 @@ def token_command(
 @app.command(name="node", help="Check RPC url")
 def node_command(
     urls: Annotated[list[str], typer.Argument()],
-    print_format: Annotated[PrintFormat, typer.Option("--format", "-f", help="Print format")] = PrintFormat.TABLE,
     proxy: Annotated[str | None, typer.Option("--proxy", "-p", help="Proxy")] = None,
+    print_format: Annotated[PrintFormat, typer.Option("--format", "-f", help="Print format")] = PrintFormat.TABLE,
 ) -> None:
-    node_cmd.run(urls, print_format, proxy)
+    node_cmd.run(urls, proxy, print_format)
 
 
 @wallet_app.command(name="mnemonic", help="Generate eth accounts based on a mnemonic")
@@ -185,16 +195,6 @@ def transfer_command(
 #     )
 
 
-@app.command(name="balances", help="Print base and ERC20 token balances")
-def balances_command(
-    config_path: Path,
-    print_config: bool = typer.Option(False, "--config", "-c", help="Print config and exit"),
-    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=print_config, wei=wei, show_nonce=nonce))
-
-
 @app.command(name="call-contract", help="Call a method on a contract")
 def call_contract_command(
     config_path: Path,

mm_eth/cli/cli_utils.py

@@ -23,6 +23,8 @@ def public_rpc_url(url: str | None) -> str:
     match url.lower():
         case "mainnet" | "1":
             return "https://ethereum.publicnode.com"
+        case "sepolia" | "11155111":
+            return "https://ethereum-sepolia-rpc.publicnode.com"
         case "opbnb" | "204":
             return "https://opbnb-mainnet-rpc.bnbchain.org"
         case "base" | "8453":

mm_eth/cli/cmd/balance_cmd.py

@@ -1,4 +1,4 @@
-from mm_std import Err, Ok, PrintFormat, fatal, print_json, print_plain
+from mm_std import PrintFormat, print_json, print_plain
 
 from mm_eth import erc20, rpc
 from mm_eth.cli.cli_utils import public_rpc_url
@@ -6,46 +6,42 @@ from mm_eth.utils import from_wei_str
 
 
 def run(rpc_url: str, wallet_address: str, token_address: str | None, wei: bool, print_format: PrintFormat) -> None:
+    result: dict[str, object] = {}
     rpc_url = public_rpc_url(rpc_url)
-    json_result: dict[str, object] = {}
 
     # nonce
-    nonce = rpc.eth_get_transaction_count(rpc_url, wallet_address).ok_or_err()
-    print_plain(f"nonce: {nonce}", print_format)
-    json_result["nonce"] = nonce
-
-    # balance
-    balance_res = rpc.eth_get_balance(rpc_url, wallet_address)
-    if isinstance(balance_res, Ok):
-        balance = str(balance_res.ok) if wei else from_wei_str(balance_res.ok, "eth")
-    else:
-        balance = balance_res.err
-    print_plain(f"eth_balance: {balance}", print_format)
-    json_result["eth_balance"] = balance
-
-    if token_address is not None:
+    result["nonce"] = rpc.eth_get_transaction_count(rpc_url, wallet_address).ok_or_err()
+    if print_format == PrintFormat.PLAIN:
+        print_plain(f"nonce: {result['nonce']}")
+
+    # eth balance
+    result["eth_balance"] = (
+        rpc.eth_get_balance(rpc_url, wallet_address).map(lambda x: str(x) if wei else from_wei_str(x, "eth")).ok_or_err()
+    )
+    if print_format == PrintFormat.PLAIN:
+        print_plain(f"eth_balance: {result['eth_balance']}")
+
+    if token_address:
         # token decimal
-        decimals_res = erc20.get_decimals(rpc_url, token_address)
-        if isinstance(decimals_res, Err):
-            fatal(f"error: can't get token decimals: {decimals_res.err}")
-        decimals = decimals_res.ok
-        print_plain(f"token_decimal: {decimals}", print_format)
-        json_result["token_decimal"] = decimals
+        result["token_decimal"] = erc20.get_decimals(rpc_url, token_address).ok_or_err()
+        if print_format == PrintFormat.PLAIN:
+            print_plain(f"token_decimal: {result['token_decimal']}")
 
         # token symbol
-        symbol_res = erc20.get_symbol(rpc_url, token_address)
-        if isinstance(symbol_res, Err):
-            fatal(f"error: can't get token symbol: {symbol_res.err}")
-        symbol = symbol_res.ok
-        print_plain(f"token_symbol: {symbol}", print_format)
-        json_result["token_symbol"] = symbol
+        result["token_symbol"] = erc20.get_symbol(rpc_url, token_address).ok_or_err()
+        if print_format == PrintFormat.PLAIN:
+            print_plain(f"token_symbol: {result['token_symbol']}")
 
         # token balance
-        balance_res = erc20.get_balance(rpc_url, token_address, wallet_address)
-        if isinstance(balance_res, Err):
-            fatal(f"error: can't get token balance: {balance_res.err}")
-        balance = str(balance_res.ok) if wei else from_wei_str(balance_res.ok, "t", decimals=decimals)
-        print_plain(f"token_balance: {balance}", print_format)
-        json_result["token_balance"] = balance
-
-    print_json(json_result, print_format=print_format)
+        result["token_balance"] = (
+            erc20.get_balance(rpc_url, token_address, wallet_address)
+            .map(
+                lambda x: str(x) if wei or not result["token_decimal"] else from_wei_str(x, "t", decimals=result["token_decimal"])  # type: ignore[arg-type]
+            )
+            .ok_or_err()
+        )
+        if print_format == PrintFormat.PLAIN:
+            print_plain(f"token_balance: {result['token_balance']}")
+
+    if print_format == PrintFormat.JSON:
+        print_json(data=result)

mm_eth/cli/cmd/example_cmd.py

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

mm_eth/cli/cmd/node_cmd.py

@@ -1,4 +1,6 @@
-from mm_std import Ok, PrintFormat, print_json, print_plain
+import pydash
+from mm_std import Ok, PrintFormat, print_json
+from pydantic import BaseModel
 from rich.live import Live
 from rich.table import Table
 
@@ -6,42 +8,71 @@ from mm_eth import rpc
 from mm_eth.utils import from_wei_str, name_network
 
 
-def run(urls: list[str], print_format: PrintFormat, proxy: str | None) -> None:
-    json_result: dict[str, object] = {}
-    table = Table(title="nodes")
-    if print_format == PrintFormat.TABLE:
-        table.add_column("url")
-        table.add_column("chain_id")
-        table.add_column("chain_name")
-        table.add_column("block_number")
-        table.add_column("base_fee")
-
-    with Live(table, refresh_per_second=0.5):
-        for url in urls:
-            chain_id_res = rpc.eth_chain_id(url, timeout=10, proxies=proxy)
-            chain_id = chain_id_res.ok_or_err()
-            chain_name = ""
-            if isinstance(chain_id_res, Ok):
-                chain_name = name_network(chain_id_res.ok)
-            block_number = rpc.eth_block_number(url, timeout=10, proxies=proxy).ok_or_err()
-            base_fee = rpc.get_base_fee_per_gas(url, timeout=10, proxies=proxy).map_or_else(
-                lambda err: err,
-                lambda ok: from_wei_str(ok, "gwei"),
-            )
-
-            json_result[url] = {
-                "chain_id": chain_id,
-                "chain_name": chain_name,
-                "block_number": block_number,
-                "base_fee": base_fee,
-            }
-            if print_format == PrintFormat.TABLE:
-                table.add_row(url, str(chain_id), chain_name, str(block_number), base_fee)
-            print_plain(f"url: {url}", print_format)
-            print_plain(f"chain_id: {chain_id}", print_format)
-            print_plain(f"chain_name: {chain_name}", print_format)
-            print_plain(f"block_number: {block_number}", print_format)
-            print_plain(f"base_fee: {base_fee}", print_format)
-            print_plain("", print_format)
-
-    print_json(json_result, print_format=print_format)
+class NodeInfo(BaseModel):
+    url: str
+    chain_id: int | str
+    chain_name: str
+    block_number: int | str
+    base_fee: str
+
+    def table_row(self) -> list[object]:
+        return [self.url, self.chain_id, self.chain_name, self.block_number, self.base_fee]
+
+
+class LiveTable:
+    def __init__(self, table: Table, ignore: bool = False) -> None:
+        self.ignore = ignore
+        if ignore:
+            return
+        self.table = table
+        self.live = Live(table, auto_refresh=False)
+        self.live.start()
+
+    def add_row(self, *args: object) -> None:
+        if self.ignore:
+            return
+        self.table.add_row(*(str(a) for a in args))
+        self.live.refresh()
+
+    def stop(self) -> None:
+        if self.ignore:
+            return
+        self.live.stop()
+
+
+def run(urls: list[str], proxy: str | None, print_format: PrintFormat) -> None:
+    urls = pydash.uniq(urls)
+    result = []
+    live_table = LiveTable(
+        Table("url", "chain_id", "chain_name", "block_number", "base_fee", title="nodes"),
+        ignore=print_format != PrintFormat.TABLE,
+    )
+    for url in urls:
+        node_info = _get_node_info(url, proxy)
+        live_table.add_row(*node_info.table_row())
+        result.append(node_info)
+
+    live_table.stop()
+
+    if print_format == PrintFormat.JSON:
+        print_json(data=result)
+    # print_json(data=result)
+    # table = Table(*["url", "chain_id", "chain_name", "block_number", "base_fee"], title="nodes")
+
+    # with Live(table, refresh_per_second=0.5):
+    #     for url in urls:
+    #         table.add_row(url, str(chain_id), chain_name, str(block_number), base_fee)
+
+
+def _get_node_info(url: str, proxy: str | None) -> NodeInfo:
+    chain_id_res = rpc.eth_chain_id(url, timeout=10, proxies=proxy)
+    chain_id = chain_id_res.ok_or_err()
+    chain_name = ""
+    if isinstance(chain_id_res, Ok):
+        chain_name = name_network(chain_id_res.ok)
+    block_number = rpc.eth_block_number(url, timeout=10, proxies=proxy).ok_or_err()
+    base_fee = rpc.get_base_fee_per_gas(url, timeout=10, proxies=proxy).map_or_else(
+        lambda err: err,
+        lambda ok: from_wei_str(ok, "gwei"),
+    )
+    return NodeInfo(url=url, chain_id=chain_id, chain_name=chain_name, block_number=block_number, base_fee=base_fee)

mm_eth/cli/cmd/transfer_cmd.py

@@ -31,7 +31,7 @@ class Config(BaseConfig):
     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_or_token_expression("balance"))]
+    default_value: Annotated[str | None, AfterValidator(Validators.valid_eth_or_token_expression("balance"))] = None
     value_min_limit: Annotated[str | None, AfterValidator(Validators.valid_eth_or_token_expression())] = None
     gas: Annotated[str, AfterValidator(Validators.valid_eth_expression("estimate"))]
     delay: Annotated[str | None, AfterValidator(Validators.valid_calc_decimal_value())] = None  # in seconds
@@ -51,18 +51,20 @@ class Config(BaseConfig):
             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
+            if not transfer.value and self.default_value:
+                transfer.value = self.default_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.default_value:
+                Validators.valid_token_expression("balance")(self.default_value)
             if self.value_min_limit:
                 Validators.valid_token_expression()(self.value_min_limit)
         else:
-            Validators.valid_eth_expression("balance")(self.value)
+            if self.default_value:
+                Validators.valid_eth_expression("balance")(self.default_value)
             if self.value_min_limit:
                 Validators.valid_eth_expression()(self.value_min_limit)
 

mm_eth/cli/examples/transfer.toml

@@ -1,8 +1,10 @@
+# Each line is a transfer instruction, with format: from_address to_address [value]
+# Value is optional. If value is not set, default_value will be used
+# value is an expression that can contain variable 'balance' and 'random' function
 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
+0x10ecB8d838746643E613f6B5218C8e342593225c 0xE19242B72a4833eD86F1b2015d4E59052A2b278b
 file: /path/to/other_transfers.txt # transfers from this file will be added
 """
 
@@ -14,17 +16,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_limit = "10.1gwei-random(1,10)" # optional
+max_fee = "1.2base_fee+1gwei+random(1,200)" # 'base_fee' variable is supported
 
 priority_fee = "1gwei+random(1,12)"
 
-gas = "estimate+random(100,200)-19" # supported var_name=estimate
+# Don't transfer if max_fee > max_fee_limit, optional
+max_fee_limit = "10.1gwei-random(1,10)"
+
+gas = "estimate+random(100,200)-19" # 'estimate' variable is supported
 
-value = "0.5balance-random(1.5t,3t)+11t" # supported var_name=balance. For ERC20 token use 't' suffix.
+# default_value is used if transfer.value is not set in transfers. It's optional.
+default_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" # don't transfer if transfer.value is less than this
 
 delay = "random(1.123,10)+1" # secs, optional
 

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

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

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

@@ -16,23 +16,23 @@ 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=nSOxvfjEu6HBXz6qFOCuiLFgw381pzeNB2tUGxdJIgA,9332
-mm_eth/cli/cli_utils.py,sha256=yBIS3dGid75zyxw8crPOQHA4p3Krk5BoA2g01turKmQ,1712
+mm_eth/cli/cli.py,sha256=yunHFL67-cEBXfogVgYzqLIhtjPIlyHtC6UNZdNg9Mw,9332
+mm_eth/cli/cli_utils.py,sha256=6TIGGEh3zGPTJQ6DKeOdz8JBg0XdL5gWt6WwppRThyk,1814
 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=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/balance_cmd.py,sha256=aWJFteLnkgw9RqDsIV34a5_rh00fmFR9SXSJUtVyP3U,1856
 mm_eth/cli/cmd/balances_cmd.py,sha256=4UiWSNH9OCnkvcMGPTygEss8119do-rfG7QtsNMfWZs,4197
 mm_eth/cli/cmd/call_contract_cmd.py,sha256=RbBPvyUEQ45hQINYDKkx1yWhPygdymVKlRL26xI31uk,1264
 mm_eth/cli/cmd/deploy_cmd.py,sha256=0oBp_RZw_DIEtBFRc6QKdAw5oouwwpDIdeXvuyP9xdU,1272
 mm_eth/cli/cmd/encode_input_data_cmd.py,sha256=9UQ1MKPEFQJ8j_COsP3KGKhwOf9tT3feBezI8vvxTlw,267
-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/example_cmd.py,sha256=QLipRKoR6T1my9qnMpzk2uPtj61mbwcuCMNFmyqRgJo,276
+mm_eth/cli/cmd/node_cmd.py,sha256=tFk4YECUUb-Rt_YIfMc_IGlqzxQjpsZmjp7OK2v0crI,2502
 mm_eth/cli/cmd/rpc_cmd.py,sha256=02q82YqgbPezfEBmV_QBCIeNReE7ktkPych8Xr9ann8,2186
 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=r8mZK9WyqXdR-Ce7Xb4hhOOHEKaJhPfbmYigC_4HzqU,13151
+mm_eth/cli/cmd/transfer_cmd.py,sha256=5Twb94GSZ0NiOj1PgY_1TdIHDoGN3Eq6qACelnCQPWQ,13298
 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
@@ -40,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=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/examples/transfer.toml,sha256=8mWuphDquoSDJw-hb9VJqtonjmv3kJ5Ip8jJ4t5YnfM,1810
+mm_eth-0.5.2.dist-info/METADATA,sha256=2raUNBANLfGusBbUHhjikWncc8_HSxioQz8_Ux0XXgI,243
+mm_eth-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_eth-0.5.2.dist-info/entry_points.txt,sha256=aGhpsozl8NIrkuUcX5fSgURCcDhr3ShUdeTSIrJq4oc,46
+mm_eth-0.5.2.dist-info/RECORD,,