mm-sol 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

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/cli/cmd/example_cmd.py

@@ -1,8 +1,8 @@
 from pathlib import Path
 
-from mm_std import print_plain
+from mm_std import pretty_print_toml
 
 
 def run(module: str) -> None:
     example_file = Path(Path(__file__).parent.absolute(), "../examples", f"{module}.toml")
-    print_plain(example_file.read_text())
+    pretty_print_toml(example_file.read_text())

mm_sol/cli/cmd/node_cmd.py

@@ -1,9 +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:
-    for url in urls:
-        res = rpc.get_block_height(url, proxy=proxy, timeout=10)
-        print_json({url: res.ok_or_err()})
+    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.0.dist-info → mm_sol-0.5.2.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.5.0
+Version: 0.5.2
 Requires-Python: >=3.12
 Requires-Dist: base58~=2.1.1
 Requires-Dist: jinja2>=3.1.5
-Requires-Dist: mm-crypto-utils>=0.2.3
+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.0.dist-info → mm_sol-0.5.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mm_sol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/account.py,sha256=0pjvNxwhpmDHoXY3oTY2fNlQHoWPmlS77r8JcP8lAy4,4545
-mm_sol/balance.py,sha256=9QvcBeKikfoR2D4s6KIw0GnnY1_grXk5KHIzd5tMM_4,3239
+mm_sol/balance.py,sha256=hBL35J7xyiFwhGoJGArdzZuWzqfeueYAF6AFrkY_Gow,2793
 mm_sol/block.py,sha256=4Lc4TANgpGvPflVumC9MR-3vIl1dedGyci3cgzczuds,1794
 mm_sol/constants.py,sha256=WSpfz5_cq_8XbIrNFJGu9okwbfPTL00zsyR_k9-7O0o,29
 mm_sol/converters.py,sha256=rBxe3SIADZS8hG7TYl4FgjmvKH-ykaTmNbnWWQDiFZ4,1430
@@ -18,15 +18,15 @@ mm_sol/cli/validators.py,sha256=M_Rr7JoG3TUYTDAGkjQLDH6l9i9FOrSpss30KdY3UlM,1379
 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/example_cmd.py,sha256=ZLTy1-cmapiCyYvjFInVE-pQCGKZzDgYKUhsOwtbSIY,234
+mm_sol/cli/cmd/node_cmd.py,sha256=-T3AvUOHPKEQWET7gyDVtwNT24SFX0_9rsgfSjnM_Cw,331
 mm_sol/cli/cmd/transfer_cmd.py,sha256=eQzD7LispR4KFMUlXdXMBGbXs7b0A-iHJHs7VkxH1UA,11021
 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=333g2EkyYBDW7OWFGMIWVZGkdFQMMo0Ag-bg-BvS4Zg,349
 mm_sol/cli/examples/transfer.toml,sha256=kOCdmuwmhlOam4LVtlcYTKF0PoZYHWMlv9gWxNSXMOk,1624
-mm_sol-0.5.0.dist-info/METADATA,sha256=oszZ4Bv24rOTDdMZf6y5FugE0yCiSqANtii1_NluRKc,259
-mm_sol-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_sol-0.5.0.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
-mm_sol-0.5.0.dist-info/RECORD,,
+mm_sol-0.5.2.dist-info/METADATA,sha256=Cb75u6Cpw3Zg6puOe78hHHltWFedIolbe7wTAKS48Dc,290
+mm_sol-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.5.2.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.5.2.dist-info/RECORD,,