mm-sol 0.5.1__tar.gz → 0.5.2__tar.gz

{mm_sol-0.5.1 → mm_sol-0.5.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.5.1
+Version: 0.5.2
 Requires-Python: >=3.12
 Requires-Dist: base58~=2.1.1
-Requires-Dist: cryptography>=44.0.1
 Requires-Dist: jinja2>=3.1.5
-Requires-Dist: mm-crypto-utils>=0.2.4
+Requires-Dist: mm-crypto-utils>=0.2.6
 Requires-Dist: mnemonic==0.21
 Requires-Dist: solana~=0.36.5
+Requires-Dist: solders~=0.23.0
 Requires-Dist: typer>=0.15.1

{mm_sol-0.5.1 → mm_sol-0.5.2}/pyproject.toml

@@ -1,16 +1,16 @@
 [project]
 name = "mm-sol"
-version = "0.5.1"
+version = "0.5.2"
 description = ""
 requires-python = ">=3.12"
 dependencies = [
-    "mm-crypto-utils>=0.2.4",
+    "mm-crypto-utils>=0.2.6",
     "solana~=0.36.5",
+    "solders~=0.23.0",
     "base58~=2.1.1",
     "mnemonic==0.21",
     "typer>=0.15.1",
     "jinja2>=3.1.5",
-    "cryptography>=44.0.1", # remove after mm-crypto-utils update
 ]
 [project.scripts]
 mm-sol = "mm_sol.cli.cli:app"

{mm_sol-0.5.1 → mm_sol-0.5.2}/src/mm_sol/balance.py

@@ -2,8 +2,10 @@ import httpx
 from mm_crypto_utils import Nodes, Proxies, random_node, random_proxy
 from mm_std import Err, Ok, Result
 from solana.exceptions import SolanaRpcException
-from solana.rpc.types import TokenAccountOpts
+from solana.rpc.core import RPCException
 from solders.pubkey import Pubkey
+from solders.rpc.errors import InvalidParamsMessage
+from spl.token.instructions import get_associated_token_address
 
 from mm_sol import rpc
 from mm_sol.utils import get_client
@@ -31,42 +33,32 @@ def get_token_balance(
     token_account: str | None = None,
     timeout: float = 10,
     proxy: str | None = None,
-    no_token_accounts_return_zero: bool = True,
 ) -> Result[int]:
-    data: list[object] = []
     try:
         client = get_client(node, proxy=proxy, timeout=timeout)
-        if token_account:
-            res_balance = client.get_token_account_balance(Pubkey.from_string(token_account))
-            data.append(res_balance)
-            return Ok(int(res_balance.value.amount))
+        if not token_account:
+            token_account = str(
+                get_associated_token_address(Pubkey.from_string(owner_address), Pubkey.from_string(token_mint_address))
+            )
 
-        res_accounts = client.get_token_accounts_by_owner(
-            Pubkey.from_string(owner_address),
-            TokenAccountOpts(mint=Pubkey.from_string(token_mint_address)),
-        )
-        data.append(res_accounts)
+        res = client.get_token_account_balance(Pubkey.from_string(token_account))
 
-        if no_token_accounts_return_zero and not res_accounts.value:
+        # Sometimes it not raise an error, but it returns this :(
+        if isinstance(res, InvalidParamsMessage) and "could not find account" in res.message:
             return Ok(0)
-        if not res_accounts.value:
-            return Err("no_token_accounts")
-
-        token_accounts = [a.pubkey for a in res_accounts.value]
-        balances = []
-        for token_account_ in token_accounts:
-            res = client.get_token_account_balance(token_account_)
-            data.append(res)
-            if res.value:  # type:ignore[truthy-bool]
-                balances.append(int(res.value.amount))
-
-        return Ok(sum(balances))
+        return Ok(int(res.value.amount), data=res)
+    except RPCException as e:
+        if len(e.args) > 1:
+            s = e.args[0]
+            if isinstance(s, InvalidParamsMessage) and "could not find account" in s.message:
+                return Ok(0)
+        return Err(e)
     except httpx.HTTPStatusError as e:
-        return Err(f"http error: {e}", data=data)
+        return Err(f"http error: {e}")
     except SolanaRpcException as e:
-        return Err(e.error_msg, data=data)
+        return Err(e.error_msg)
     except Exception as e:
-        return Err(e, data=data)
+        return Err(e)
 
 
 def get_token_balance_with_retries(
@@ -77,7 +69,6 @@ def get_token_balance_with_retries(
     token_account: str | None = None,
     timeout: float = 10,
     proxies: Proxies = None,
-    no_token_accounts_return_zero: bool = True,
 ) -> Result[int]:
     res: Result[int] = Err("not started yet")
     for _ in range(retries):
@@ -88,11 +79,8 @@ def get_token_balance_with_retries(
             token_account,
             timeout=timeout,
             proxy=random_proxy(proxies),
-            no_token_accounts_return_zero=no_token_accounts_return_zero,
         )
         if res.is_ok():
             return res
-        if isinstance(res, Err) and res.err == "no_token_accounts":
-            return res
 
     return res

mm_sol-0.5.2/src/mm_sol/cli/cmd/node_cmd.py

@@ -0,0 +1,11 @@
+from mm_std import print_json
+
+from mm_sol import rpc
+from mm_sol.cli import cli_utils
+
+
+def run(urls: list[str], proxy: str | None) -> None:
+    result = {}
+    for url in [cli_utils.public_rpc_url(u) for u in urls]:
+        result[url] = rpc.get_block_height(url, proxy=proxy, timeout=10).ok_or_err()
+    print_json(data=result)

{mm_sol-0.5.1 → mm_sol-0.5.2}/tests/test_token.py

@@ -10,19 +10,7 @@ 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, proxies):
-    res = mm_sol.balance.get_token_balance_with_retries(
-        mainnet_node,
-        generate_account().public_key,
-        usdt_token_address,
-        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, proxies):
+def test_get_balance_no_tokens_account(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
     )

{mm_sol-0.5.1 → mm_sol-0.5.2}/uv.lock

@@ -472,27 +472,27 @@ wheels = [
 
 [[package]]
 name = "mm-crypto-utils"
-version = "0.2.4"
+version = "0.2.6"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "loguru" },
     { name = "mm-std" },
 ]
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/1b/80/261c463cad1176b14d92b7390328f89184307f201d9d3117012abe5e8a72/mm_crypto_utils-0.2.4-py3-none-any.whl", hash = "sha256:487214228ce79ffb9a8afeef13d67b578393558d03a0268d4b7747174f9ac7ce", size = 8255 },
+    { url = "https://files.pythonhosted.org/packages/d2/2a/72236eb60cb007d472fa6be72a98abf6b8273df3158a218cc5f412f86497/mm_crypto_utils-0.2.6-py3-none-any.whl", hash = "sha256:ef738203e2863570308d0fc5fee8f05c469d3f7df905dcdfd092d84690b14c9c", size = 8269 },
 ]
 
 [[package]]
 name = "mm-sol"
-version = "0.5.1"
+version = "0.5.2"
 source = { editable = "." }
 dependencies = [
     { name = "base58" },
-    { name = "cryptography" },
     { name = "jinja2" },
     { name = "mm-crypto-utils" },
     { name = "mnemonic" },
     { name = "solana" },
+    { name = "solders" },
     { name = "typer" },
 ]
 
@@ -509,11 +509,11 @@ dev = [
 [package.metadata]
 requires-dist = [
     { name = "base58", specifier = "~=2.1.1" },
-    { name = "cryptography", specifier = ">=44.0.1" },
     { name = "jinja2", specifier = ">=3.1.5" },
-    { name = "mm-crypto-utils", specifier = ">=0.2.4" },
+    { name = "mm-crypto-utils", specifier = ">=0.2.6" },
     { name = "mnemonic", specifier = "==0.21" },
     { name = "solana", specifier = "~=0.36.5" },
+    { name = "solders", specifier = "~=0.23.0" },
     { name = "typer", specifier = ">=0.15.1" },
 ]
 
@@ -529,7 +529,7 @@ dev = [
 
 [[package]]
 name = "mm-std"
-version = "0.3.0"
+version = "0.3.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "cryptography" },
@@ -541,7 +541,7 @@ dependencies = [
     { name = "rich" },
 ]
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/41/b3/8e14a0eaf34b2db3f4c97eacafff63d63bb8c28f7baf718b3bc99f948dc2/mm_std-0.3.0-py3-none-any.whl", hash = "sha256:3aaab32cb88c29741d7a37cea4b2cb74548ec9b94ea4f8ebf0149f678ad921a3", size = 14693 },
+    { url = "https://files.pythonhosted.org/packages/c0/9a/19f88e047426a52de2f8262d654ca8f20b6b9f15085db7dca6850b7d89d9/mm_std-0.3.2-py3-none-any.whl", hash = "sha256:bf479b1810c887b41aa8b4ad3b6d59d2002703a26b04499516af8e2d94351c86", size = 14709 },
 ]
 
 [[package]]

mm_sol-0.5.1/src/mm_sol/cli/cmd/node_cmd.py

@@ -1,9 +0,0 @@
-from mm_std import print_json
-
-from mm_sol import rpc
-
-
-def run(urls: list[str], proxy: str | None) -> None:
-    for url in urls:
-        res = rpc.get_block_height(url, proxy=proxy, timeout=10)
-        print_json({url: res.ok_or_err()})