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

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

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

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

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

{mm_sol-0.3.3 → mm_sol-0.3.4}/src/mm_sol/cli/cmd/balances_cmd.py

@@ -4,13 +4,14 @@ from pathlib import Path
 from typing import Annotated, Any
 
 from mm_crypto_utils import ConfigValidators
-from mm_std import BaseConfig, print_json
+from mm_std import BaseConfig, Err, fatal, print_json
 from pydantic import BeforeValidator
 
 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):
@@ -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.4}/src/mm_sol/cli/examples/balances.toml

@@ -7,3 +7,4 @@ tokens = """
 65FKbLPtrssmc8aVn9DEBY8VTGB85vsgadrmaW9H4nEB
 """
 nodes = "https://api.mainnet-beta.solana.com"
+# proxies = "env_url: MM_SOL_PROXIES_URL"

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

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