mm-sol 0.3.5__py3-none-any.whl → 0.3.6__py3-none-any.whl

mm_sol/cli/cli_utils.py

@@ -4,12 +4,8 @@ import time
 import mm_crypto_utils
 from loguru import logger
 from mm_crypto_utils import Nodes, Proxies
-from rich.live import Live
-from rich.table import Table
 from solders.signature import Signature
 
-from mm_sol.balance import get_sol_balance_with_retries
-from mm_sol.converters import lamports_to_sol
 from mm_sol.utils import get_client
 
 
@@ -32,27 +28,6 @@ def public_rpc_url(url: str | None) -> str:
     return url
 
 
-def print_balances(
-    rpc_nodes: list[str],
-    addresses: list[str],
-    *,
-    proxies: Proxies = None,
-    round_ndigits: int = 5,
-) -> None:
-    table = Table(title="balances")
-    table.add_column("n")
-    table.add_column("address")
-    table.add_column("balance, sol")
-    with Live(table, refresh_per_second=0.5):
-        for count, address in enumerate(addresses):
-            balance = get_sol_balance_with_retries(rpc_nodes, address, proxies=proxies, retries=5).map_or_else(
-                lambda err: err,
-                lambda ok: str(lamports_to_sol(ok, round_ndigits)),
-            )
-            row: list[str] = [str(count), address, balance]
-            table.add_row(*row)
-
-
 def wait_confirmation(nodes: Nodes, proxies: Proxies, signature: Signature, log_prefix: str) -> bool:
     count = 0
     while True:

mm_sol/cli/cmd/transfer_sol_cmd.py

@@ -8,8 +8,11 @@ from loguru import logger
 from mm_crypto_utils import AddressToPrivate, TxRoute
 from mm_std import BaseConfig, Err, utc_now
 from pydantic import AfterValidator, BeforeValidator, Field, model_validator
+from rich.live import Live
+from rich.table import Table
 
 from mm_sol import transfer
+from mm_sol.balance import get_sol_balance_with_retries
 from mm_sol.cli import calcs, cli_utils
 from mm_sol.cli.calcs import calc_sol_expression
 from mm_sol.cli.validators import Validators
@@ -58,7 +61,7 @@ def run(
     mm_crypto_utils.init_logger(debug, config.log_debug, config.log_info)
 
     if print_balances:
-        cli_utils.print_balances(config.nodes, config.from_addresses, round_ndigits=config.round_ndigits, proxies=config.proxies)
+        _print_balances(config)
         sys.exit(0)
 
     _run_transfers(config, no_confirmation=no_confirmation, emulate=emulate)
@@ -137,3 +140,20 @@ def _transfer(*, from_address: str, to_address: str, config: Config, no_confirma
             status = "OK"
         msg = f"{log_prefix}: sig={signature}, value={lamports_to_sol(value, config.round_ndigits)}, status={status}"
         logger.info(msg)
+
+
+def _print_balances(config: Config) -> None:
+    table = Table("n", "from_address", "sol", "to_address", "sol", title="balances")
+    with Live(table, refresh_per_second=0.5):
+        for count, route in enumerate(config.routes):
+            from_balance = _get_sol_balance_str(route.from_address, config)
+            to_balance = _get_sol_balance_str(route.to_address, config)
+            row: list[str] = [str(count), route.from_address, from_balance, route.to_address, to_balance]
+            table.add_row(*row)
+
+
+def _get_sol_balance_str(address: str, config: Config) -> str:
+    return get_sol_balance_with_retries(config.nodes, address, proxies=config.proxies, retries=5).map_or_else(
+        lambda err: err,
+        lambda ok: str(lamports_to_sol(ok, config.round_ndigits)),
+    )

mm_sol/cli/cmd/transfer_token_cmd.py

@@ -4,16 +4,18 @@ from pathlib import Path
 from typing import Annotated, Self
 
 import mm_crypto_utils
-import typer
 from loguru import logger
 from mm_crypto_utils import AddressToPrivate, TxRoute
 from mm_std import BaseConfig, Err, fatal, utc_now
 from pydantic import AfterValidator, BeforeValidator, Field, model_validator
+from rich.live import Live
+from rich.table import Table
 
 from mm_sol import transfer
+from mm_sol.balance import get_sol_balance_with_retries, get_token_balance_with_retries
 from mm_sol.cli import calcs, cli_utils
 from mm_sol.cli.validators import Validators
-from mm_sol.converters import to_token
+from mm_sol.converters import lamports_to_sol, to_token
 from mm_sol.token import get_decimals_with_retries
 
 
@@ -67,8 +69,7 @@ def run(
     logger.debug(f"token decimals={token_decimals}")
 
     if print_balances:
-        # cli_utils.print_balances(config.nodes, config.from_addresses, round_ndigits=config.round_ndigits, proxies=config.proxies) # noqa: E501
-        typer.echo("Not implemented yet")
+        _print_balances(config, token_decimals)
         sys.exit(0)
 
     _run_transfers(config, token_decimals, no_confirmation=no_confirmation, emulate=emulate)
@@ -151,3 +152,37 @@ def _transfer(*, route: TxRoute, config: Config, token_decimals: int, no_confirm
             status = "OK"
         msg = f"{log_prefix}: sig={signature}, value={value_t}, status={status}"
         logger.info(msg)
+
+
+def _print_balances(config: Config, token_decimals: int) -> None:
+    table = Table("n", "from_address", "sol", "t", "to_address", "sol", "t", title="balances")
+    with Live(table, refresh_per_second=0.5):
+        for count, route in enumerate(config.routes):
+            from_sol_balance = _get_sol_balance_str(route.from_address, config)
+            to_sol_balance = _get_sol_balance_str(route.to_address, config)
+            from_t_balance = _get_token_balance_str(route.from_address, config, token_decimals)
+            to_t_balance = _get_token_balance_str(route.to_address, config, token_decimals)
+            row: list[str] = [
+                str(count),
+                route.from_address,
+                from_sol_balance,
+                from_t_balance,
+                route.to_address,
+                to_sol_balance,
+                to_t_balance,
+            ]
+            table.add_row(*row)
+
+
+def _get_sol_balance_str(address: str, config: Config) -> str:
+    return get_sol_balance_with_retries(config.nodes, address, proxies=config.proxies, retries=5).map_or_else(
+        lambda err: err,
+        lambda ok: str(lamports_to_sol(ok, config.round_ndigits)),
+    )
+
+
+def _get_token_balance_str(address: str, config: Config, token_decimals: int) -> str:
+    return get_token_balance_with_retries(config.nodes, address, config.token, proxies=config.proxies, retries=5).map_or_else(
+        lambda err: err,
+        lambda ok: str(to_token(ok, token_decimals, ndigits=config.round_ndigits)),
+    )

mm_sol/cli/examples/transfer-sol.toml

@@ -3,6 +3,7 @@ Bd8CxCTLez2ckVTqEJjuZkWjYFSRbo8fA1qYbd7yFVP9 Eaft9xXzfgbRqsHd65WspoaxTtH7pkznM9Y
 Fc2TRJVCpFZpRz56mFnQETctib1zwFnwHcS7HoQSgUzZ EVJctTWikt29rUXBf49tyQdK87x837HtvpCwqeSjp1Ur
 """
 private_keys = "file: ./path/to/privates.txt"
-value = "0.012 sol"
+value = "0.5balance - 0.012sol"
+delay = "random(5,10)"
 proxies = "url: https://site.com/api/get-proxies"
 nodes = "https://api.devnet.solana.com"

{mm_sol-0.3.5.dist-info → mm_sol-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.3.5
+Version: 0.3.6
 Requires-Python: >=3.12
 Requires-Dist: base58~=2.1.1
 Requires-Dist: jinja2>=3.1.5

{mm_sol-0.3.5.dist-info → mm_sol-0.3.6.dist-info}/RECORD

@@ -13,22 +13,22 @@ mm_sol/utils.py,sha256=NE0G564GiT9d7rW_lPPxUb1eq62WiXh28xtvtzNQIqw,556
 mm_sol/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/cli/calcs.py,sha256=-r9RlsQyOziTDf84uIsvTgZmsUdNrVeazu3vTj9hhNA,1887
 mm_sol/cli/cli.py,sha256=OlgBas-dWWZJ_WCbHJGLX6GxfILvIy7Q0VhgRo_nytE,4945
-mm_sol/cli/cli_utils.py,sha256=Skj0SCHPWMHGr2ag-em1JtIK9Qdh7xeJafMzvCgChnc,2254
+mm_sol/cli/cli_utils.py,sha256=HCMnOhMSQtAGQpZaA2e5v_li-XNDv4P3LxBcSSTPDoo,1399
 mm_sol/cli/validators.py,sha256=HLCFRrBOdyAMj_ibdAkkP36y9Zm2Dt3gMKoyPOcaiQE,1164
 mm_sol/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/cli/cmd/balance_cmd.py,sha256=DfUZY3-Hr-F7Y0xp1faol0yLnPu6iDU3b839VhdwAbw,2587
 mm_sol/cli/cmd/balances_cmd.py,sha256=gMRZXAnCOPESsKRqz33ALPzSOqGGeZF225kMRO6sV-c,2876
 mm_sol/cli/cmd/example_cmd.py,sha256=M5dvRg9jvpVUwxvMRiRnO77aKR7c57bMY9booxMAswM,222
 mm_sol/cli/cmd/node_cmd.py,sha256=2AEAjq2M9f8-RZiI0rif6wITdns9QUb4Kr34QPsI2CA,238
-mm_sol/cli/cmd/transfer_sol_cmd.py,sha256=3kdukRKQYRW56jzFmNU30JJByq0igTMwbhipg2CEXZA,5349
-mm_sol/cli/cmd/transfer_token_cmd.py,sha256=BZYOBzROfHNn0jvFBUTgFcgJQyB5nR8iZ80ZohRwh2c,5947
+mm_sol/cli/cmd/transfer_sol_cmd.py,sha256=CfCQ3SsXzdd2Yy3awlM2l7D1LuCNnSUg_Y84ttpL9-Q,6155
+mm_sol/cli/cmd/transfer_token_cmd.py,sha256=gepB8dds1xnGMYT1UBwV8EgpKmST3SvWS99lXnc2X3E,7470
 mm_sol/cli/cmd/wallet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/cli/cmd/wallet/keypair_cmd.py,sha256=cRHVVTs9zNYmUozZ8ZlJoutn9V6r8I1AEHBrszR7dTE,538
 mm_sol/cli/cmd/wallet/mnemonic_cmd.py,sha256=IiON_fJT5AFfIr_E1LR6_iDYZ3c_jWCFc-wSYqk61V8,648
 mm_sol/cli/examples/balances.toml,sha256=jyfUXusAWe6suuuwnPIfqWdU2kfT3hfMjkZ6uYMg8s0,347
-mm_sol/cli/examples/transfer-sol.toml,sha256=1LdkhSBC0y5oMJXjm8MVIMyZruIrYSIm3LBDGmcS5Iw,353
+mm_sol/cli/examples/transfer-sol.toml,sha256=7y_F2Kd-x05zbJ4Uw6NYegIXaZES5v96WQY8JKVpuwY,388
 mm_sol/cli/examples/transfer-token.toml,sha256=I_Wof-APv-h6xeYVq0zbWfLbpDny2kz9U0xJifVNEtU,401
-mm_sol-0.3.5.dist-info/METADATA,sha256=RYUzypxIkw8xXA9xtI0T38rFYq2SmmEtRSbDEe3ogB4,259
-mm_sol-0.3.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_sol-0.3.5.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
-mm_sol-0.3.5.dist-info/RECORD,,
+mm_sol-0.3.6.dist-info/METADATA,sha256=XcbspoW4fU3UlQLdVu6Z9rN-LELguqgfv_U2AGJr9js,259
+mm_sol-0.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.3.6.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.3.6.dist-info/RECORD,,