mm-sol 0.5.6__py3-none-any.whl → 0.5.8__py3-none-any.whl

mm_sol/async_rpc.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from mm_std import Result, ahr
+from mm_std import Result, hra
 
 
 async def rpc_call(
@@ -19,7 +19,7 @@ async def rpc_call(
 
 
 async def _http_call(node: str, data: dict[str, object], timeout: float, proxy: str | None) -> Result[Any]:
-    res = await ahr(node, method="POST", proxy=proxy, timeout=timeout, params=data, json_params=True)
+    res = await hra(node, method="POST", proxy=proxy, timeout=timeout, params=data, json_params=True)
     try:
         if res.is_error():
             return res.to_err_result()

mm_sol/rpc_async.py

@@ -0,0 +1,65 @@
+import json
+from collections.abc import Sequence
+from typing import Any
+
+import websockets
+from mm_std import DataResult, http_request
+
+
+async def rpc_call(
+    node: str,
+    method: str,
+    params: Sequence[object],
+    timeout: float,
+    proxy: str | None,
+    id_: int = 1,
+) -> DataResult[Any]:
+    data = {"jsonrpc": "2.0", "method": method, "params": params, "id": id_}
+    if node.startswith("http"):
+        return await _http_call(node, data, timeout, proxy)
+    return await _ws_call(node, data, timeout)
+
+
+async def _http_call(node: str, data: dict[str, object], timeout: float, proxy: str | None) -> DataResult[Any]:
+    res = await http_request(node, method="POST", proxy=proxy, timeout=timeout, json=data)
+    if res.is_error():
+        return res.to_data_result_err()
+    try:
+        parsed_body = res.parse_json_body()
+        err = parsed_body.get("error", {}).get("message", "")
+        if err:
+            return res.to_data_result_err(f"service_error: {err}")
+        if "result" in parsed_body:
+            return res.to_data_result_ok(parsed_body["result"])
+        return res.to_data_result_err("unknown_response")
+    except Exception as err:
+        return res.to_data_result_err(f"exception: {err}")
+
+
+async def _ws_call(node: str, data: dict[str, object], timeout: float) -> DataResult[Any]:
+    try:
+        async with websockets.connect(node, open_timeout=timeout) as ws:
+            await ws.send(json.dumps(data))
+            response = json.loads(await ws.recv())
+
+        err = response.get("error", {}).get("message", "")
+        if err:
+            return DataResult(err=f"service_error: {err}", data=response)
+        if "result" in response:
+            return DataResult(ok=response["result"], data=response)
+        return DataResult(err="unknown_response", data=response)
+    except TimeoutError:
+        return DataResult(err="timeout")
+    except Exception as err:
+        return DataResult(err=f"exception: {err}")
+
+
+async def get_block_height(node: str, timeout: float = 10, proxy: str | None = None) -> DataResult[int]:
+    return await rpc_call(node=node, method="getBlockHeight", params=[], timeout=timeout, proxy=proxy)
+
+
+async def get_balance(node: str, address: str, timeout: float = 10, proxy: str | None = None) -> DataResult[int]:
+    """Returns balance in lamports"""
+    return (await rpc_call(node=node, method="getBalance", params=[address], timeout=timeout, proxy=proxy)).map(
+        lambda r: r["value"]
+    )

mm_sol/token_async.py

@@ -0,0 +1,40 @@
+import httpx
+from mm_std import DataResult
+from solana.exceptions import SolanaRpcException
+from solana.rpc.core import RPCException
+from solders.solders import InvalidParamsMessage, Pubkey, get_associated_token_address
+
+from mm_sol.utils import get_async_client
+
+
+async def get_token_balance(
+    node: str,
+    owner_address: str,
+    token_mint_address: str,
+    token_account: str | None = None,
+    timeout: float = 10,
+    proxy: str | None = None,
+) -> DataResult[int]:
+    try:
+        client = get_async_client(node, proxy=proxy, timeout=timeout)
+        if not token_account:
+            token_account = str(
+                get_associated_token_address(Pubkey.from_string(owner_address), Pubkey.from_string(token_mint_address))
+            )
+
+        res = await client.get_token_account_balance(Pubkey.from_string(token_account))
+
+        # Sometimes it not raise an error, but it returns this :(
+        if isinstance(res, InvalidParamsMessage) and "could not find account" in res.message:
+            return DataResult(ok=0, data=res.to_json())
+        return DataResult(ok=int(res.value.amount), data=res.to_json())
+    except RPCException as e:
+        if "could not find account" in str(e):
+            return DataResult(ok=0, data={"rpc_exception": str(e)})
+        return DataResult(err="error", data={"rpc_exception": str(e)})
+    except httpx.HTTPStatusError as e:
+        return DataResult(err=f"http error: {e}")
+    except SolanaRpcException as e:
+        return DataResult(err=e.error_msg)
+    except Exception as e:
+        return DataResult(err="exception", data={"exception": str(e)})

{mm_sol-0.5.6.dist-info → mm_sol-0.5.8.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.5.6
+Version: 0.5.8
 Requires-Python: >=3.12
 Requires-Dist: base58~=2.1.1
 Requires-Dist: jinja2>=3.1.6
-Requires-Dist: mm-crypto-utils>=0.2.9
+Requires-Dist: mm-crypto-utils>=0.2.13
 Requires-Dist: mnemonic==0.21
 Requires-Dist: socksio>=1.0.0
 Requires-Dist: solana~=0.36.6

{mm_sol-0.5.6.dist-info → mm_sol-0.5.8.dist-info}/RECORD

@@ -1,14 +1,16 @@
 mm_sol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/account.py,sha256=9aDP5si-QJfSF8fz8K6geGUGh9GL83YJNkdU1qd4Xu8,4515
-mm_sol/async_rpc.py,sha256=VpAovAgtDT-5OmwGyT8b-Ky_EtrGPKENKxZGGnw3_D8,1406
+mm_sol/async_rpc.py,sha256=3_pEu4ywBjA_ej6cX5q4WJcN1oaPDeIAFa5xNceFCGw,1406
 mm_sol/balance.py,sha256=5sSIQbipNUeB_Hn7piwrYt-PuSEf4ZKB8puUmC986iY,5112
 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
 mm_sol/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/rpc.py,sha256=Tw7THbU0lShjTGNGe4-Mc6q1U5E2dgjY2LIfrMTSfeA,8057
+mm_sol/rpc_async.py,sha256=xdvlA9RB5ZZA0lnIRvyNHOHsuIpM7iuzkFF2vKEQCGE,2474
 mm_sol/solana_cli.py,sha256=ig3OoTvmkrl7MFQSZjRHIraLSmtse0_9kn5Nsw8_zb0,8258
 mm_sol/token.py,sha256=O8z3UE3iZGYLWw8fnd9weYMcoQO0m88noqbRO_jntGg,1092
+mm_sol/token_async.py,sha256=5B9sRTyUMOCmt4oj2eAPLo8vqNbs3er89Klqsb-jQSY,1613
 mm_sol/transfer.py,sha256=taf2NTLpo-bxISeaILARXEGLldUvqvP-agp5IDva7Hw,5825
 mm_sol/utils.py,sha256=oD06NsMSMhN6lqsM6mSgLTtiKwA1uAsen9WR82ofRTE,923
 mm_sol/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,7 +29,7 @@ mm_sol/cli/cmd/wallet/keypair_cmd.py,sha256=cRHVVTs9zNYmUozZ8ZlJoutn9V6r8I1AEHBr
 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.6.dist-info/METADATA,sha256=ZAo75jqkghH06Uqiw_8bIU79xwX3Y3En599R3R_9A_4,320
-mm_sol-0.5.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_sol-0.5.6.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
-mm_sol-0.5.6.dist-info/RECORD,,
+mm_sol-0.5.8.dist-info/METADATA,sha256=MmEwreyEm8-zYHxk_W74OAZK_K6dUiIUN9vE2CE7G3E,321
+mm_sol-0.5.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.5.8.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.5.8.dist-info/RECORD,,