mm-sol 0.3.3__tar.gz → 0.3.5__tar.gz

{mm_sol-0.3.3 → mm_sol-0.3.5}/PKG-INFO

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

mm_sol-0.3.5/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.3 → mm_sol-0.3.5}/pyproject.toml

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

{mm_sol-0.3.3 → mm_sol-0.3.5}/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.3 → mm_sol-0.3.5}/src/mm_sol/cli/cmd/balances_cmd.py

@@ -4,20 +4,21 @@ from pathlib import Path
 from typing import Annotated, Any
 
 from mm_crypto_utils import ConfigValidators
-from mm_std import BaseConfig, print_json
-from pydantic import BeforeValidator
+from mm_std import BaseConfig, Err, fatal, print_json
+from pydantic import BeforeValidator, Field
 
 import mm_sol.converters
 from mm_sol import balance
 from mm_sol.balance import get_token_balance_with_retries
 from mm_sol.cli.validators import Validators
+from mm_sol.token import get_decimals_with_retries
 
 
 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:
@@ -34,22 +35,31 @@ def run(config_path: Path, print_config: bool) -> None:
 
     if config.tokens:
         for token in config.tokens:
-            result[token] = _get_token_balances(token, config.accounts, config)
+            token_decimals_res = get_decimals_with_retries(config.nodes, token, retries=3, proxies=config.proxies)
+            if isinstance(token_decimals_res, Err):
+                fatal(f"Failed to get decimals for token {token}: {token_decimals_res.unwrap_err()}")
+            token_decimals = token_decimals_res.unwrap()
+            result[token] = _get_token_balances(token, token_decimals, config.accounts, config)
+            result[token + "_decimals"] = token_decimals
             result[token + "_sum"] = sum([v for v in result[token].values() if v is not None])
 
     print_json(result)
 
 
-def _get_token_balances(token: str, accounts: list[str], config: Config) -> dict[str, int | None]:
+def _get_token_balances(token: str, token_decimals: int, accounts: list[str], config: Config) -> dict[str, Decimal | None]:
     result = {}
     for account in accounts:
-        result[account] = get_token_balance_with_retries(
-            nodes=config.nodes,
-            owner_address=account,
-            token_mint_address=token,
-            retries=3,
-            proxies=config.proxies,
-        ).ok_or_none()
+        result[account] = (
+            get_token_balance_with_retries(
+                nodes=config.nodes,
+                owner_address=account,
+                token_mint_address=token,
+                retries=3,
+                proxies=config.proxies,
+            )
+            .map(lambda v: mm_sol.converters.to_token(v, token_decimals))
+            .unwrap_or(None)
+        )
     return result
 
 

{mm_sol-0.3.3 → mm_sol-0.3.5}/src/mm_sol/cli/cmd/transfer_sol_cmd.py

@@ -7,7 +7,7 @@ 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 mm_sol import transfer
 from mm_sol.cli import calcs, cli_utils
@@ -21,7 +21,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

{mm_sol-0.3.3 → mm_sol-0.3.5}/src/mm_sol/cli/cmd/transfer_token_cmd.py

@@ -8,7 +8,7 @@ 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 mm_sol import transfer
 from mm_sol.cli import calcs, cli_utils
@@ -22,7 +22,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

mm_sol-0.3.5/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.3 → mm_sol-0.3.5}/src/mm_sol/converters.py

@@ -2,10 +2,14 @@ from decimal import Decimal
 
 
 def lamports_to_sol(lamports: int, ndigits: int = 4) -> Decimal:
+    if lamports == 0:
+        return Decimal(0)
     return Decimal(str(round(lamports / 10**9, ndigits=ndigits)))
 
 
 def to_token(smallest_unit_value: int, decimals: int, ndigits: int = 4) -> Decimal:
+    if smallest_unit_value == 0:
+        return Decimal(0)
     return Decimal(str(round(smallest_unit_value / 10**decimals, ndigits=ndigits)))
 
 

{mm_sol-0.3.3 → mm_sol-0.3.5}/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.3 → mm_sol-0.3.5}/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.3 → mm_sol-0.3.5}/uv.lock

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

mm_sol-0.3.3/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.3/src/mm_sol/cli/examples/balances.toml

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