mm-sol 0.5.4__tar.gz → 0.5.5__tar.gz

{mm_sol-0.5.4 → mm_sol-0.5.5}/PKG-INFO

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

{mm_sol-0.5.4 → mm_sol-0.5.5}/README.md

@@ -8,3 +8,6 @@ sudo curl -LsSf https://astral.sh/uv/install.sh | sh
 source $HOME/.local/bin/env
 uv tool install mm-sol
 ```
+
+### Notes
+- AsyncClient from solana-py with socks5 proxy ignores timeout. Use http proxy. 

{mm_sol-0.5.4 → mm_sol-0.5.5}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "mm-sol"
-version = "0.5.4"
+version = "0.5.5"
 description = ""
 requires-python = ">=3.12"
 dependencies = [
-    "mm-crypto-utils>=0.2.8",
+    "mm-crypto-utils>=0.2.9",
     "solana~=0.36.6",
     "base58~=2.1.1",
     "mnemonic==0.21",
@@ -23,7 +23,7 @@ build-backend = "hatchling.build"
 dev-dependencies = [
     "pytest~=8.3.5",
     "pytest-xdist~=3.6.1",
-    "ruff~=0.10.0",
+    "ruff~=0.11.2",
     "pip-audit~=2.8.0",
     "bandit~=1.8.3",
     "mypy~=1.15.0",
@@ -64,6 +64,7 @@ ignore = [
     "TD003", # flake8-todos: missing-todo-link
     "RET503", # flake8-return: implicit-return
     "COM812", # it's used in ruff formatter
+    "ASYNC109", # flake8-async: async-function-with-timeout
 ]
 [tool.ruff.lint.pep8-naming]
 classmethod-decorators = ["field_validator"]

mm_sol-0.5.5/src/mm_sol/async_rpc.py

@@ -0,0 +1,42 @@
+from typing import Any
+
+from mm_std import Result, ahr
+
+
+async def rpc_call(
+    *,
+    node: str,
+    method: str,
+    params: list[Any],
+    id_: int = 1,
+    timeout: float = 10,
+    proxy: str | None = None,
+) -> Result[Any]:
+    data = {"jsonrpc": "2.0", "method": method, "params": params, "id": id_}
+    if node.startswith("http"):
+        return await _http_call(node, data, timeout, proxy)
+    raise NotImplementedError("ws is not implemented")
+
+
+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)
+    try:
+        if res.is_error():
+            return res.to_err_result()
+
+        err = res.json.get("error", {}).get("message", "")
+        if err:
+            return res.to_err_result(f"service_error: {err}")
+        if "result" in res.json:
+            return res.to_ok_result(res.json["result"])
+
+        return res.to_err_result("unknown_response")
+    except Exception as e:
+        return res.to_err_result(f"exception: {e!s}")
+
+
+async def get_balance(node: str, address: str, timeout: float = 10, proxy: str | None = None) -> Result[int]:
+    """Returns balance in lamports"""
+    return (await rpc_call(node=node, method="getBalance", params=[address], timeout=timeout, proxy=proxy)).and_then(
+        lambda r: r["value"]
+    )

mm_sol-0.5.5/src/mm_sol/balance.py

@@ -0,0 +1,161 @@
+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.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 async_rpc, rpc
+from mm_sol.utils import get_async_client, get_client
+
+
+def get_sol_balance(node: str, address: str, timeout: float = 10, proxy: str | None = None) -> Result[int]:
+    return rpc.get_balance(node, address, timeout, proxy)
+
+
+async def get_sol_balance_async(node: str, address: str, timeout: float = 10, proxy: str | None = None) -> Result[int]:
+    return await async_rpc.get_balance(node, address, timeout, proxy)
+
+
+def get_sol_balance_with_retries(
+    nodes: Nodes, address: str, retries: int, timeout: float = 10, proxies: Proxies = None
+) -> Result[int]:
+    res: Result[int] = Err("not started yet")
+    for _ in range(retries):
+        res = get_sol_balance(random_node(nodes), address, timeout=timeout, proxy=random_proxy(proxies))
+        if res.is_ok():
+            return res
+    return res
+
+
+async def get_sol_balance_with_retries_async(
+    nodes: Nodes, address: str, retries: int, timeout: float = 10, proxies: Proxies = None
+) -> Result[int]:
+    res: Result[int] = Err("not started yet")
+    for _ in range(retries):
+        res = await get_sol_balance_async(random_node(nodes), address, timeout=timeout, proxy=random_proxy(proxies))
+        if res.is_ok():
+            return res
+    return res
+
+
+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,
+) -> Result[int]:
+    try:
+        client = get_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 = 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 Ok(0)
+        return Ok(int(res.value.amount), data=res.to_json())
+    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}")
+    except SolanaRpcException as e:
+        return Err(e.error_msg)
+    except Exception as e:
+        return Err(e)
+
+
+async def get_token_balance_async(
+    node: str,
+    owner_address: str,
+    token_mint_address: str,
+    token_account: str | None = None,
+    timeout: float = 10,
+    proxy: str | None = None,
+) -> Result[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 Ok(0)
+        return Ok(int(res.value.amount), data=res.to_json())
+    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}")
+    except SolanaRpcException as e:
+        return Err(e.error_msg)
+    except Exception as e:
+        return Err(e)
+
+
+def get_token_balance_with_retries(
+    nodes: Nodes,
+    owner_address: str,
+    token_mint_address: str,
+    retries: int,
+    token_account: str | None = None,
+    timeout: float = 10,
+    proxies: Proxies = None,
+) -> Result[int]:
+    res: Result[int] = Err("not started yet")
+    for _ in range(retries):
+        res = get_token_balance(
+            random_node(nodes),
+            owner_address,
+            token_mint_address,
+            token_account,
+            timeout=timeout,
+            proxy=random_proxy(proxies),
+        )
+        if res.is_ok():
+            return res
+
+    return res
+
+
+async def get_token_balance_with_retries_async(
+    nodes: Nodes,
+    owner_address: str,
+    token_mint_address: str,
+    retries: int,
+    token_account: str | None = None,
+    timeout: float = 10,
+    proxies: Proxies = None,
+) -> Result[int]:
+    res: Result[int] = Err("not started yet")
+    for _ in range(retries):
+        res = await get_token_balance_async(
+            random_node(nodes),
+            owner_address,
+            token_mint_address,
+            token_account,
+            timeout=timeout,
+            proxy=random_proxy(proxies),
+        )
+        if res.is_ok():
+            return res
+
+    return res

{mm_sol-0.5.4 → mm_sol-0.5.5}/src/mm_sol/rpc.py

@@ -78,7 +78,7 @@ def rpc_call(
     method: str,
     params: list[Any],
     id_: int = 1,
-    timeout: int = 10,
+    timeout: float = 10,
     proxy: str | None = None,
 ) -> Result[Any]:
     data = {"jsonrpc": "2.0", "method": method, "params": params, "id": id_}
@@ -87,7 +87,7 @@ def rpc_call(
     raise NotImplementedError("ws is not implemented")
 
 
-def _http_call(node: str, data: dict[str, object], timeout: int, proxy: str | None) -> Result[Any]:
+def _http_call(node: str, data: dict[str, object], timeout: float, proxy: str | None) -> Result[Any]:
     res = hr(node, method="POST", proxy=proxy, timeout=timeout, params=data, json_params=True)
     try:
         if res.is_error():
@@ -104,38 +104,38 @@ def _http_call(node: str, data: dict[str, object], timeout: int, proxy: str | No
         return res.to_err_result(f"exception: {e!s}")
 
 
-def get_balance(node: str, address: str, timeout: int = 10, proxy: str | None = None) -> Result[int]:
+def get_balance(node: str, address: str, timeout: float = 10, proxy: str | None = None) -> Result[int]:
     """Returns balance in lamports"""
     return rpc_call(node=node, method="getBalance", params=[address], timeout=timeout, proxy=proxy).and_then(lambda r: r["value"])
 
 
-def get_block_height(node: str, timeout: int = 10, proxy: str | None = None) -> Result[int]:
+def get_block_height(node: str, timeout: float = 10, proxy: str | None = None) -> Result[int]:
     """Returns balance in lamports"""
     return rpc_call(node=node, method="getBlockHeight", params=[], timeout=timeout, proxy=proxy)
 
 
-def get_slot(node: str, timeout: int = 10, proxy: str | None = None) -> Result[int]:
+def get_slot(node: str, timeout: float = 10, proxy: str | None = None) -> Result[int]:
     return rpc_call(node=node, method="getSlot", params=[], timeout=timeout, proxy=proxy)
 
 
-def get_epoch_info(node: str, epoch: int | None = None, timeout: int = 10, proxy: str | None = None) -> Result[EpochInfo]:
+def get_epoch_info(node: str, epoch: int | None = None, timeout: float = 10, proxy: str | None = None) -> Result[EpochInfo]:
     params = [epoch] if epoch else []
     return rpc_call(node=node, method="getEpochInfo", params=params, timeout=timeout, proxy=proxy).and_then(
         lambda r: EpochInfo(**r),
     )
 
 
-def get_health(node: str, timeout: int = 10, proxy: str | None = None) -> Result[bool]:
+def get_health(node: str, timeout: float = 10, proxy: str | None = None) -> Result[bool]:
     return rpc_call(node=node, method="getHealth", params=[], timeout=timeout, proxy=proxy).and_then(lambda r: r == "ok")
 
 
-def get_cluster_nodes(node: str, timeout: int = 30, proxy: str | None = None) -> Result[list[ClusterNode]]:
+def get_cluster_nodes(node: str, timeout: float = 30, proxy: str | None = None) -> Result[list[ClusterNode]]:
     return rpc_call(node=node, method="getClusterNodes", timeout=timeout, proxy=proxy, params=[]).and_then(
         lambda r: [ClusterNode(**n) for n in r],
     )
 
 
-def get_vote_accounts(node: str, timeout: int = 30, proxy: str | None = None) -> Result[list[VoteAccount]]:
+def get_vote_accounts(node: str, timeout: float = 30, proxy: str | None = None) -> Result[list[VoteAccount]]:
     res = rpc_call(node=node, method="getVoteAccounts", timeout=timeout, proxy=proxy, params=[])
     if res.is_err():
         return res
@@ -182,7 +182,7 @@ def get_vote_accounts(node: str, timeout: int = 30, proxy: str | None = None) ->
 def get_leader_scheduler(
     node: str,
     slot: int | None = None,
-    timeout: int = 10,
+    timeout: float = 10,
     proxy: str | None = None,
 ) -> Result[dict[str, list[int]]]:
     return rpc_call(
@@ -194,7 +194,7 @@ def get_leader_scheduler(
     )
 
 
-def get_block_production(node: str, timeout: int = 60, proxy: str | None = None) -> Result[BlockProduction]:
+def get_block_production(node: str, timeout: float = 60, proxy: str | None = None) -> Result[BlockProduction]:
     res = rpc_call(node=node, method="getBlockProduction", timeout=timeout, proxy=proxy, params=[])
     if res.is_err():
         return res
@@ -211,7 +211,7 @@ def get_block_production(node: str, timeout: int = 60, proxy: str | None = None)
         return Err(e, data=res.data)
 
 
-def get_stake_activation(node: str, address: str, timeout: int = 60, proxy: str | None = None) -> Result[StakeActivation]:
+def get_stake_activation(node: str, address: str, timeout: float = 60, proxy: str | None = None) -> Result[StakeActivation]:
     return rpc_call(node=node, method="getStakeActivation", timeout=timeout, proxy=proxy, params=[address]).and_then(
         lambda ok: StakeActivation(**ok),
     )
@@ -222,7 +222,7 @@ def get_transaction(
     signature: str,
     max_supported_transaction_version: int | None = None,
     encoding: str = "json",
-    timeout: int = 60,
+    timeout: float = 60,
     proxy: str | None = None,
 ) -> Result[dict[str, object] | None]:
     if max_supported_transaction_version is not None:

{mm_sol-0.5.4 → mm_sol-0.5.5}/src/mm_sol/utils.py

@@ -1,4 +1,5 @@
 from solana.rpc.api import Client
+from solana.rpc.async_api import AsyncClient
 from solana.rpc.commitment import Commitment
 from solders.pubkey import Pubkey
 
@@ -13,6 +14,16 @@ def get_client(
     return Client(endpoint, commitment=commitment, extra_headers=extra_headers, timeout=timeout, proxy=proxy)
 
 
+def get_async_client(
+    endpoint: str,
+    commitment: Commitment | None = None,
+    extra_headers: dict[str, str] | None = None,
+    proxy: str | None = None,
+    timeout: float = 10,
+) -> AsyncClient:
+    return AsyncClient(endpoint, commitment=commitment, extra_headers=extra_headers, timeout=timeout, proxy=proxy)
+
+
 def pubkey(value: str | Pubkey) -> Pubkey:
     if isinstance(value, Pubkey):
         return value

{mm_sol-0.5.4 → mm_sol-0.5.5}/tests/conftest.py

@@ -5,7 +5,12 @@ import pytest
 from dotenv import load_dotenv
 from typer.testing import CliRunner
 
-load_dotenv(".env")
+load_dotenv()
+
+
+@pytest.fixture
+def anyio_backend():
+    return "asyncio"
 
 
 @pytest.fixture

mm_sol-0.5.5/tests/test_async_rpc.py

@@ -0,0 +1,10 @@
+import pytest
+
+from mm_sol import async_rpc
+
+pytestmark = pytest.mark.anyio
+
+
+async def test_get_balance(mainnet_node, binance_wallet, random_proxy):
+    res = await async_rpc.get_balance(mainnet_node, binance_wallet, proxy=random_proxy)
+    assert res.unwrap() > 10_000_000

mm_sol-0.5.5/tests/test_balance.py

@@ -0,0 +1,25 @@
+import pytest
+
+from mm_sol.balance import get_sol_balance, get_sol_balance_async, get_token_balance, get_token_balance_async
+
+pytestmark = pytest.mark.anyio
+
+
+def test_get_sol_balance(mainnet_node, usdt_owner_address, random_proxy):
+    res = get_sol_balance(mainnet_node, usdt_owner_address, proxy=random_proxy)
+    assert res.unwrap() > 10
+
+
+async def test_get_sol_balance_async(mainnet_node, usdt_owner_address, random_proxy):
+    res = await get_sol_balance_async(mainnet_node, usdt_owner_address, proxy=random_proxy)
+    assert res.unwrap() > 10
+
+
+def test_get_token_balance(mainnet_node, binance_wallet, usdt_token_address, random_proxy):
+    res = get_token_balance(mainnet_node, binance_wallet, usdt_token_address, proxy=random_proxy)
+    assert res.unwrap() > 10
+
+
+async def test_get_token_balance_async(mainnet_node, binance_wallet, usdt_token_address, random_proxy):
+    res = await get_token_balance_async(mainnet_node, binance_wallet, usdt_token_address, proxy=random_proxy)
+    assert res.unwrap() > 10

{mm_sol-0.5.4 → mm_sol-0.5.5}/uv.lock

@@ -13,15 +13,16 @@ wheels = [
 
 [[package]]
 name = "anyio"
-version = "4.6.2.post1"
+version = "4.9.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "idna" },
     { name = "sniffio" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/9f/09/45b9b7a6d4e45c6bcb5bf61d19e3ab87df68e0601fa8c5293de3542546cc/anyio-4.6.2.post1.tar.gz", hash = "sha256:4c8bc31ccdb51c7f7bd251f51c609e038d63e34219b44aa86e47576389880b4c", size = 173422 }
+sdist = { url = "https://files.pythonhosted.org/packages/95/7d/4c1bd541d4dffa1b52bd83fb8527089e097a106fc90b467a7313b105f840/anyio-4.9.0.tar.gz", hash = "sha256:673c0c244e15788651a4ff38710fea9675823028a6f08a5eda409e0c9840a028", size = 190949 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e4/f5/f2b75d2fc6f1a260f340f0e7c6a060f4dd2961cc16884ed851b0d18da06a/anyio-4.6.2.post1-py3-none-any.whl", hash = "sha256:6d170c36fba3bdd840c73d3868c1e777e33676a69c3a72cf0a0d5d6d8009b61d", size = 90377 },
+    { url = "https://files.pythonhosted.org/packages/a1/ee/48ca1a7c89ffec8b6a0c5d02b89c305671d5ffd8d3c94acf8b8c408575bb/anyio-4.9.0-py3-none-any.whl", hash = "sha256:9f76d541cad6e36af7beb62e978876f3b41e3e04f2c1fbf0884604c0a9c4d93c", size = 100916 },
 ]
 
 [[package]]
@@ -309,6 +310,11 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517 },
 ]
 
+[package.optional-dependencies]
+socks = [
+    { name = "socksio" },
+]
+
 [[package]]
 name = "idna"
 version = "3.10"
@@ -434,19 +440,19 @@ wheels = [
 
 [[package]]
 name = "mm-crypto-utils"
-version = "0.2.8"
+version = "0.2.9"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "loguru" },
     { name = "mm-std" },
 ]
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c2/1c/0c6ad62e4671970eb643524742573cf3ee0dd8b2e1f58c6a7458efe8ae5e/mm_crypto_utils-0.2.8-py3-none-any.whl", hash = "sha256:04be8b12968e66973c916390737e31d55682cb5ce746cef73261e7d0381b2f7b", size = 8273 },
+    { url = "https://files.pythonhosted.org/packages/bb/4c/c790acb5b025d35a391dd4fef1ebb3b6432a874154844a618d27b10a0a0f/mm_crypto_utils-0.2.9-py3-none-any.whl", hash = "sha256:0b569067e4c4f8e568599134febe23aacbb903bb80799e4258180ec4a51bec9b", size = 8273 },
 ]
 
 [[package]]
 name = "mm-sol"
-version = "0.5.4"
+version = "0.5.5"
 source = { editable = "." }
 dependencies = [
     { name = "base58" },
@@ -472,7 +478,7 @@ dev = [
 requires-dist = [
     { name = "base58", specifier = "~=2.1.1" },
     { name = "jinja2", specifier = ">=3.1.6" },
-    { name = "mm-crypto-utils", specifier = ">=0.2.8" },
+    { name = "mm-crypto-utils", specifier = ">=0.2.9" },
     { name = "mnemonic", specifier = "==0.21" },
     { name = "socksio", specifier = ">=1.0.0" },
     { name = "solana", specifier = "~=0.36.6" },
@@ -486,16 +492,19 @@ dev = [
     { name = "pip-audit", specifier = "~=2.8.0" },
     { name = "pytest", specifier = "~=8.3.5" },
     { name = "pytest-xdist", specifier = "~=3.6.1" },
-    { name = "ruff", specifier = "~=0.10.0" },
+    { name = "ruff", specifier = "~=0.11.2" },
 ]
 
 [[package]]
 name = "mm-std"
-version = "0.3.9"
+version = "0.3.14"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
+    { name = "anyio" },
     { name = "cryptography" },
+    { name = "httpx", extra = ["socks"] },
     { name = "pydantic" },
+    { name = "pydantic-settings" },
     { name = "pydash" },
     { name = "python-dotenv" },
     { name = "requests", extra = ["socks"] },
@@ -503,7 +512,7 @@ dependencies = [
     { name = "tomlkit" },
 ]
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c7/74/072e33a54a0cdbd7699a17f32950f8fd57e766ce74b768ccb4128cc5da24/mm_std-0.3.9-py3-none-any.whl", hash = "sha256:3ad5ee2fe720e939169a23aa7c9a5f3c7cee25232a184bb3415720ef740ddd04", size = 15581 },
+    { url = "https://files.pythonhosted.org/packages/47/61/cd5cbfc1868493ffda46c7d86d94459110ec4dd28c1883936f18f36bfab0/mm_std-0.3.14-py3-none-any.whl", hash = "sha256:db0a3a66590f456ad8c3f268d545803be63339c4b72f3197bc377d101a93ad02", size = 20219 },
 ]
 
 [[package]]
@@ -752,6 +761,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/51/b2/b2b50d5ecf21acf870190ae5d093602d95f66c9c31f9d5de6062eb329ad1/pydantic_core-2.27.2-cp313-cp313-win_arm64.whl", hash = "sha256:ac4dbfd1691affb8f48c2c13241a2e3b60ff23247cbcf981759c768b6633cf8b", size = 1885186 },
 ]
 
+[[package]]
+name = "pydantic-settings"
+version = "2.8.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pydantic" },
+    { name = "python-dotenv" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/88/82/c79424d7d8c29b994fb01d277da57b0a9b09cc03c3ff875f9bd8a86b2145/pydantic_settings-2.8.1.tar.gz", hash = "sha256:d5c663dfbe9db9d5e1c646b2e161da12f0d734d422ee56f567d0ea2cee4e8585", size = 83550 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0b/53/a64f03044927dc47aafe029c42a5b7aabc38dfb813475e0e1bf71c4a59d0/pydantic_settings-2.8.1-py3-none-any.whl", hash = "sha256:81942d5ac3d905f7f3ee1a70df5dfb62d5569c12f51a5a647defc1c3d9ee2e9c", size = 30839 },
+]
+
 [[package]]
 name = "pydash"
 version = "8.0.5"
@@ -889,27 +911,27 @@ wheels = [
 
 [[package]]
 name = "ruff"
-version = "0.10.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/4c/ec/9c59d2956566517c98ac8267554f4eaceafb2a19710a429368518b7fab43/ruff-0.10.0.tar.gz", hash = "sha256:fa1554e18deaf8aa097dbcfeafaf38b17a2a1e98fdc18f50e62e8a836abee392", size = 3789921 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/bf/3f/742afe91b43def2a75990b293c676355576c0ff9cdbcf4249f78fa592544/ruff-0.10.0-py3-none-linux_armv6l.whl", hash = "sha256:46a2aa0eaae5048e5f804f0be9489d8a661633e23277b7293089e70d5c1a35c4", size = 10078369 },
-    { url = "https://files.pythonhosted.org/packages/8d/a0/8696fb4862e82f7b40bbbc2917137594b22826cc62d77278a91391507514/ruff-0.10.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:775a6bc61af9dd0a2e1763406522a137e62aabb743d8b43ed95f019cdd1526c7", size = 10876912 },
-    { url = "https://files.pythonhosted.org/packages/40/aa/0d48b7b7d7a1f168bb8fd893ed559d633c7d68c4a8ef9b996f0c2bd07aca/ruff-0.10.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:8b03e6fcd39d20f0004f9956f0ed5eadc404d3a299f9d9286323884e3b663730", size = 10229962 },
-    { url = "https://files.pythonhosted.org/packages/21/de/861ced2f75b045d8cfc038d68961d8ac117344df1f43a11abdd05bf7991b/ruff-0.10.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:621101d1af80248827f2409a78c8177c8319986a57b4663613b9c72f8617bfcd", size = 10404627 },
-    { url = "https://files.pythonhosted.org/packages/21/69/666e0b840191c3ce433962c0d05fc0f6800afe259ea5d230cc731655d8e2/ruff-0.10.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e2dfe85cb6bfbd4259801e7d4982f2a72bdbd5749dc73a09d68a6dbf77f2209a", size = 9939383 },
-    { url = "https://files.pythonhosted.org/packages/76/bf/34a2adc58092c99cdfa9f1303acd82d840d56412022e477e2ab20c261d2d/ruff-0.10.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:43ac3879a20c22fdc57e559f0bb27f0c71828656841d0b42d3505b1e5b3a83c8", size = 11492269 },
-    { url = "https://files.pythonhosted.org/packages/31/3d/f7ccfcf69f15948623b190feea9d411d5029ae39725fcc078f8d43bd07a6/ruff-0.10.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:ef5e3aac421bbc62f8a7aab21edd49a359ed42205f7a5091a74386bca1efa293", size = 12186939 },
-    { url = "https://files.pythonhosted.org/packages/6e/3e/c557c0abfdea85c7d238a3cb238c73e7b6d17c30a584234c4fd8fe2cafb6/ruff-0.10.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9f4f62d7fac8b748fce67ad308116b4d4cc1a9f964b4804fc5408fbd06e13ba9", size = 11655896 },
-    { url = "https://files.pythonhosted.org/packages/3b/8e/3bfa110f37e5192eb3943f14943d05fbb9a76fea380aa87655e6f6276a54/ruff-0.10.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:02f9f6205c5b0d626f98da01a0e75b724a64c21c554bba24b12522c9e9ba6a04", size = 13885502 },
-    { url = "https://files.pythonhosted.org/packages/51/4a/22cdab59b5563dd7f4c504d0f1e6bb25fc800a5a057395bc24f8ff3a85b2/ruff-0.10.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:46a97f3d55f68464c48d1e929a8582c7e5bb80ac73336bbc7b0da894d8e6cd9e", size = 11344767 },
-    { url = "https://files.pythonhosted.org/packages/3d/0f/8f85de2ac565f82f47c6d8fb7ae04383e6300560f2d1b91c1268ff91e507/ruff-0.10.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:a0b811197d0dc96c13d610f8cfdc56030b405bcff5c2f10eab187b329da0ca4a", size = 10300331 },
-    { url = "https://files.pythonhosted.org/packages/90/4a/b337df327832cb30bd8607e8d1fdf1b6b5ca228307d5008dd49028fb66ae/ruff-0.10.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:a13a3fda0870c1c964b47ff5d73805ae80d2a9de93ee2d185d453b8fddf85a84", size = 9926551 },
-    { url = "https://files.pythonhosted.org/packages/d7/e9/141233730b85675ac806c4b62f70516bd9c0aae8a55823f3a6589ed411be/ruff-0.10.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:6ceb8d9f062e90ddcbad929f6136edf764bbf6411420a07e8357602ea28cd99f", size = 10925061 },
-    { url = "https://files.pythonhosted.org/packages/24/09/02987935b55c2d353a226ac1b4f9718830e2e195834929f46c07eeede746/ruff-0.10.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:c41d07d573617ed2f287ea892af2446fd8a8d877481e8e1ba6928e020665d240", size = 11394949 },
-    { url = "https://files.pythonhosted.org/packages/d6/ec/054f9879fb6f4122d43ffe5c9f88c8c323a9cd14220d5c813aea5805e02c/ruff-0.10.0-py3-none-win32.whl", hash = "sha256:76e2de0cbdd587e373cd3b4050d2c45babdd7014c1888a6f121c29525c748a15", size = 10272077 },
-    { url = "https://files.pythonhosted.org/packages/6e/49/915d8682f24645b904fe6a1aac36101464fc814923fdf293c1388dc5533c/ruff-0.10.0-py3-none-win_amd64.whl", hash = "sha256:f943acdecdcc6786a8d1dad455dd9f94e6d57ccc115be4993f9b52ef8316027a", size = 11393300 },
-    { url = "https://files.pythonhosted.org/packages/82/ed/5c59941634c9026ceeccc7c119f23f4356f09aafd28c15c1bc734ac66b01/ruff-0.10.0-py3-none-win_arm64.whl", hash = "sha256:935a943bdbd9ff0685acd80d484ea91088e27617537b5f7ef8907187d19d28d0", size = 10510133 },
+version = "0.11.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/90/61/fb87430f040e4e577e784e325351186976516faef17d6fcd921fe28edfd7/ruff-0.11.2.tar.gz", hash = "sha256:ec47591497d5a1050175bdf4e1a4e6272cddff7da88a2ad595e1e326041d8d94", size = 3857511 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/62/99/102578506f0f5fa29fd7e0df0a273864f79af044757aef73d1cae0afe6ad/ruff-0.11.2-py3-none-linux_armv6l.whl", hash = "sha256:c69e20ea49e973f3afec2c06376eb56045709f0212615c1adb0eda35e8a4e477", size = 10113146 },
+    { url = "https://files.pythonhosted.org/packages/74/ad/5cd4ba58ab602a579997a8494b96f10f316e874d7c435bcc1a92e6da1b12/ruff-0.11.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:2c5424cc1c4eb1d8ecabe6d4f1b70470b4f24a0c0171356290b1953ad8f0e272", size = 10867092 },
+    { url = "https://files.pythonhosted.org/packages/fc/3e/d3f13619e1d152c7b600a38c1a035e833e794c6625c9a6cea6f63dbf3af4/ruff-0.11.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:ecf20854cc73f42171eedb66f006a43d0a21bfb98a2523a809931cda569552d9", size = 10224082 },
+    { url = "https://files.pythonhosted.org/packages/90/06/f77b3d790d24a93f38e3806216f263974909888fd1e826717c3ec956bbcd/ruff-0.11.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0c543bf65d5d27240321604cee0633a70c6c25c9a2f2492efa9f6d4b8e4199bb", size = 10394818 },
+    { url = "https://files.pythonhosted.org/packages/99/7f/78aa431d3ddebfc2418cd95b786642557ba8b3cb578c075239da9ce97ff9/ruff-0.11.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:20967168cc21195db5830b9224be0e964cc9c8ecf3b5a9e3ce19876e8d3a96e3", size = 9952251 },
+    { url = "https://files.pythonhosted.org/packages/30/3e/f11186d1ddfaca438c3bbff73c6a2fdb5b60e6450cc466129c694b0ab7a2/ruff-0.11.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:955a9ce63483999d9f0b8f0b4a3ad669e53484232853054cc8b9d51ab4c5de74", size = 11563566 },
+    { url = "https://files.pythonhosted.org/packages/22/6c/6ca91befbc0a6539ee133d9a9ce60b1a354db12c3c5d11cfdbf77140f851/ruff-0.11.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:86b3a27c38b8fce73bcd262b0de32e9a6801b76d52cdb3ae4c914515f0cef608", size = 12208721 },
+    { url = "https://files.pythonhosted.org/packages/19/b0/24516a3b850d55b17c03fc399b681c6a549d06ce665915721dc5d6458a5c/ruff-0.11.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a3b66a03b248c9fcd9d64d445bafdf1589326bee6fc5c8e92d7562e58883e30f", size = 11662274 },
+    { url = "https://files.pythonhosted.org/packages/d7/65/76be06d28ecb7c6070280cef2bcb20c98fbf99ff60b1c57d2fb9b8771348/ruff-0.11.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0397c2672db015be5aa3d4dac54c69aa012429097ff219392c018e21f5085147", size = 13792284 },
+    { url = "https://files.pythonhosted.org/packages/ce/d2/4ceed7147e05852876f3b5f3fdc23f878ce2b7e0b90dd6e698bda3d20787/ruff-0.11.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:869bcf3f9abf6457fbe39b5a37333aa4eecc52a3b99c98827ccc371a8e5b6f1b", size = 11327861 },
+    { url = "https://files.pythonhosted.org/packages/c4/78/4935ecba13706fd60ebe0e3dc50371f2bdc3d9bc80e68adc32ff93914534/ruff-0.11.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:2a2b50ca35457ba785cd8c93ebbe529467594087b527a08d487cf0ee7b3087e9", size = 10276560 },
+    { url = "https://files.pythonhosted.org/packages/81/7f/1b2435c3f5245d410bb5dc80f13ec796454c21fbda12b77d7588d5cf4e29/ruff-0.11.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:7c69c74bf53ddcfbc22e6eb2f31211df7f65054bfc1f72288fc71e5f82db3eab", size = 9945091 },
+    { url = "https://files.pythonhosted.org/packages/39/c4/692284c07e6bf2b31d82bb8c32f8840f9d0627d92983edaac991a2b66c0a/ruff-0.11.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:6e8fb75e14560f7cf53b15bbc55baf5ecbe373dd5f3aab96ff7aa7777edd7630", size = 10977133 },
+    { url = "https://files.pythonhosted.org/packages/94/cf/8ab81cb7dd7a3b0a3960c2769825038f3adcd75faf46dd6376086df8b128/ruff-0.11.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:842a472d7b4d6f5924e9297aa38149e5dcb1e628773b70e6387ae2c97a63c58f", size = 11378514 },
+    { url = "https://files.pythonhosted.org/packages/d9/3a/a647fa4f316482dacf2fd68e8a386327a33d6eabd8eb2f9a0c3d291ec549/ruff-0.11.2-py3-none-win32.whl", hash = "sha256:aca01ccd0eb5eb7156b324cfaa088586f06a86d9e5314b0eb330cb48415097cc", size = 10319835 },
+    { url = "https://files.pythonhosted.org/packages/86/54/3c12d3af58012a5e2cd7ebdbe9983f4834af3f8cbea0e8a8c74fa1e23b2b/ruff-0.11.2-py3-none-win_amd64.whl", hash = "sha256:3170150172a8f994136c0c66f494edf199a0bbea7a409f649e4bc8f4d7084080", size = 11373713 },
+    { url = "https://files.pythonhosted.org/packages/d6/d4/dd813703af8a1e2ac33bf3feb27e8a5ad514c9f219df80c64d69807e7f71/ruff-0.11.2-py3-none-win_arm64.whl", hash = "sha256:52933095158ff328f4c77af3d74f0379e34fd52f175144cefc1b192e7ccd32b4", size = 10441990 },
 ]
 
 [[package]]

mm_sol-0.5.4/src/mm_sol/balance.py

@@ -1,86 +0,0 @@
-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.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
-
-
-def get_sol_balance(node: str, address: str, timeout: int = 10, proxy: str | None = None) -> Result[int]:
-    return rpc.get_balance(node, address, timeout, proxy)
-
-
-def get_sol_balance_with_retries(
-    nodes: Nodes, address: str, retries: int, timeout: int = 10, proxies: Proxies = None
-) -> Result[int]:
-    res: Result[int] = Err("not started yet")
-    for _ in range(retries):
-        res = get_sol_balance(random_node(nodes), address, timeout=timeout, proxy=random_proxy(proxies))
-        if res.is_ok():
-            return res
-    return res
-
-
-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,
-) -> Result[int]:
-    try:
-        client = get_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 = 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 Ok(0)
-        return Ok(int(res.value.amount), data=res.to_json())
-    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}")
-    except SolanaRpcException as e:
-        return Err(e.error_msg)
-    except Exception as e:
-        return Err(e)
-
-
-def get_token_balance_with_retries(
-    nodes: Nodes,
-    owner_address: str,
-    token_mint_address: str,
-    retries: int,
-    token_account: str | None = None,
-    timeout: float = 10,
-    proxies: Proxies = None,
-) -> Result[int]:
-    res: Result[int] = Err("not started yet")
-    for _ in range(retries):
-        res = get_token_balance(
-            random_node(nodes),
-            owner_address,
-            token_mint_address,
-            token_account,
-            timeout=timeout,
-            proxy=random_proxy(proxies),
-        )
-        if res.is_ok():
-            return res
-
-    return res

mm_sol-0.5.4/tests/test_balance.py

@@ -1,6 +0,0 @@
-from mm_sol.balance import get_sol_balance
-
-
-def test_get_balance(mainnet_node, usdt_owner_address, random_proxy):
-    res = get_sol_balance(mainnet_node, usdt_owner_address, proxy=random_proxy)
-    assert res.unwrap() > 10