mm-sol 0.3.4__tar.gz → 0.3.6__tar.gz

{mm_sol-0.3.4 → mm_sol-0.3.6}/PKG-INFO

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

mm_sol-0.3.6/README.md

@@ -0,0 +1,10 @@
+# mm-sol
+A Python library and cli tool for interacting with Solana blockchain. It's based on https://github.com/michaelhly/solana-py 
+
+### Install on Ubuntu
+```shell
+sudo apt update && sudo apt-get install build-essential libgmp3-dev python3-dev -y
+sudo curl -LsSf https://astral.sh/uv/install.sh | sh
+source $HOME/.local/bin/env
+uv tool install mm-sol
+```

{mm_sol-0.3.4 → mm_sol-0.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mm-sol"
-version = "0.3.4"
+version = "0.3.6"
 description = ""
 requires-python = ">=3.12"
 dependencies = [

{mm_sol-0.3.4 → mm_sol-0.3.6}/src/mm_sol/balance.py

@@ -92,4 +92,7 @@ def get_token_balance_with_retries(
         )
         if res.is_ok():
             return res
+        if isinstance(res, Err) and res.err == "no_token_accounts":
+            return res
+
     return res

{mm_sol-0.3.4 → mm_sol-0.3.6}/src/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-0.3.4 → mm_sol-0.3.6}/src/mm_sol/cli/cmd/balances_cmd.py

@@ -5,7 +5,7 @@ from typing import Annotated, Any
 
 from mm_crypto_utils import ConfigValidators
 from mm_std import BaseConfig, Err, fatal, print_json
-from pydantic import BeforeValidator
+from pydantic import BeforeValidator, Field
 
 import mm_sol.converters
 from mm_sol import balance
@@ -18,7 +18,7 @@ class Config(BaseConfig):
     accounts: Annotated[list[str], BeforeValidator(Validators.sol_addresses(unique=True))]
     tokens: Annotated[list[str], BeforeValidator(Validators.sol_addresses(unique=True))]
     nodes: Annotated[list[str], BeforeValidator(ConfigValidators.nodes())]
-    proxies: Annotated[list[str], BeforeValidator(Validators.proxies())]
+    proxies: Annotated[list[str], Field(default_factory=list), BeforeValidator(Validators.proxies())]
 
     @property
     def random_node(self) -> str:

{mm_sol-0.3.4 → mm_sol-0.3.6}/src/mm_sol/cli/cmd/transfer_sol_cmd.py

@@ -7,9 +7,12 @@ import mm_crypto_utils
 from loguru import logger
 from mm_crypto_utils import AddressToPrivate, TxRoute
 from mm_std import BaseConfig, Err, utc_now
-from pydantic import AfterValidator, BeforeValidator, model_validator
+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
@@ -21,7 +24,7 @@ class Config(BaseConfig):
     nodes: Annotated[list[str], BeforeValidator(Validators.nodes())]
     routes: Annotated[list[TxRoute], BeforeValidator(Validators.sol_routes())]
     private_keys: Annotated[AddressToPrivate, BeforeValidator(Validators.sol_private_keys())]
-    proxies: Annotated[list[str], BeforeValidator(Validators.proxies())]
+    proxies: Annotated[list[str], Field(default_factory=list), BeforeValidator(Validators.proxies())]
     value: Annotated[str, AfterValidator(Validators.valid_sol_expression("balance"))]
     value_min_limit: Annotated[str | None, AfterValidator(Validators.valid_sol_expression())] = None
     delay: Annotated[str | None, AfterValidator(Validators.valid_calc_decimal_value())] = None  # in seconds
@@ -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-0.3.4 → mm_sol-0.3.6}/src/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, model_validator
+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
 
 
@@ -22,7 +24,7 @@ class Config(BaseConfig):
     nodes: Annotated[list[str], BeforeValidator(Validators.nodes())]
     routes: Annotated[list[TxRoute], BeforeValidator(Validators.sol_routes())]
     private_keys: Annotated[AddressToPrivate, BeforeValidator(Validators.sol_private_keys())]
-    proxies: Annotated[list[str], BeforeValidator(Validators.proxies())]
+    proxies: Annotated[list[str], Field(default_factory=list), BeforeValidator(Validators.proxies())]
     token: Annotated[str, AfterValidator(Validators.sol_address())]
     value: Annotated[str, AfterValidator(Validators.valid_token_expression("balance"))]
     value_min_limit: Annotated[str | None, AfterValidator(Validators.valid_token_expression())] = None
@@ -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-0.3.6/src/mm_sol/cli/examples/balances.toml

@@ -0,0 +1,10 @@
+accounts = """
+9WzDXwBbmkg8ZTbNMqUxvQRAyrZzDsGYdLVL9zYtAWWM # binance
+61aq585V8cR2sZBeawJFt2NPqmN7zDi1sws4KLs5xHXV # Jupiter cold wallet
+"""
+tokens = """
+EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v # USDC
+JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN # JUP
+"""
+nodes = "https://api.mainnet-beta.solana.com"
+# proxies = "env_url: MM_SOL_PROXIES_URL"

{mm_sol-0.3.4 → mm_sol-0.3.6}/src/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.4 → mm_sol-0.3.6}/src/mm_sol/transfer.py

@@ -42,13 +42,12 @@ def transfer_token(
 
     recipient_token_account = get_associated_token_address(to_address, token_mint_address, token_program_id=TOKEN_PROGRAM_ID)
     from_token_account = get_associated_token_address(from_address, token_mint_address, token_program_id=TOKEN_PROGRAM_ID)
-
     data: list[object] = []
 
     account_info_res = client.get_account_info(recipient_token_account)
     if account_info_res.value is None:
         if create_token_account_if_not_exists:
-            create_account_res = token_client.create_account(to_address, skip_confirmation=False)
+            create_account_res = token_client.create_associated_token_account(to_address, skip_confirmation=False)
             data.append(create_account_res)
         else:
             return Err("no_token_account")

{mm_sol-0.3.4 → mm_sol-0.3.6}/tests/test_token.py

@@ -10,27 +10,25 @@ def test_get_balance(mainnet_node, usdt_token_address, usdt_owner_address, proxi
     assert res.unwrap() > 0
 
 
-def test_get_balance_no_tokens_account_1(mainnet_node, usdt_token_address, random_proxy):
-    res = mm_sol.balance.get_token_balance(
+def test_get_balance_no_tokens_account_1(mainnet_node, usdt_token_address, proxies):
+    res = mm_sol.balance.get_token_balance_with_retries(
         mainnet_node,
         generate_account().public_key,
         usdt_token_address,
-        proxy=random_proxy,
+        proxies=proxies,
         no_token_accounts_return_zero=False,
+        retries=5,
     )
     assert res.err == "no_token_accounts"
 
 
-def test_get_balance_no_tokens_account_2(mainnet_node, usdt_token_address, random_proxy):
-    res = mm_sol.balance.get_token_balance(
-        mainnet_node,
-        generate_account().public_key,
-        usdt_token_address,
-        proxy=random_proxy,
+def test_get_balance_no_tokens_account_2(mainnet_node, usdt_token_address, proxies):
+    res = mm_sol.balance.get_token_balance_with_retries(
+        mainnet_node, generate_account().public_key, usdt_token_address, proxies=proxies, retries=5
     )
     assert res.ok == 0
 
 
-def test_get_decimals(mainnet_node, usdt_token_address, random_proxy):
-    res = token.get_decimals(mainnet_node, usdt_token_address, proxy=random_proxy)
+def test_get_decimals(mainnet_node, usdt_token_address, proxies):
+    res = token.get_decimals_with_retries(mainnet_node, usdt_token_address, proxies=proxies, retries=5)
     assert res.unwrap() == 6

{mm_sol-0.3.4 → mm_sol-0.3.6}/uv.lock

@@ -493,7 +493,7 @@ wheels = [
 
 [[package]]
 name = "mm-sol"
-version = "0.3.4"
+version = "0.3.6"
 source = { editable = "." }
 dependencies = [
     { name = "base58" },

mm_sol-0.3.4/README.txt

@@ -1,14 +0,0 @@
-mm-sol
-
-Maninnet RPC:
-- https://api.mainnet-beta.solana.com
-
-Testnet RPC:
-- https://api.testnet.solana.com
-
-Devnet RPC:
-- https://api.devnet.solana.com
-
-Links:
-- https://solana.com/docs/rpc
-- https://github.com/michaelhly/solana-py

mm_sol-0.3.4/src/mm_sol/cli/examples/balances.toml

@@ -1,10 +0,0 @@
-accounts = """
-5BJ9ViMj4gi2BBX3wbCEJ4p4vpVWKpG6ja2aQP2ACBUv
-HbSAUDjzpr44fWzf9Ynj3V1jq3wBsgg88N88P4vzeGPX
-"""
-tokens = """
-7XtmNSHJDHTZdx2K1S8D529kHsBbt3Civxt6vUHrGxBR
-65FKbLPtrssmc8aVn9DEBY8VTGB85vsgadrmaW9H4nEB
-"""
-nodes = "https://api.mainnet-beta.solana.com"
-# proxies = "env_url: MM_SOL_PROXIES_URL"