mm-sol 0.7.1__tar.gz → 0.7.3__tar.gz

mm_sol-0.7.3/.pre-commit-config.yaml

@@ -0,0 +1,10 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-toml
+      - id: check-json
+      - id: check-added-large-files

{mm_sol-0.7.1 → mm_sol-0.7.3}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.7.1
+Version: 0.7.3
 Requires-Python: >=3.13
 Requires-Dist: base58~=2.1.1
 Requires-Dist: jinja2>=3.1.6
-Requires-Dist: mm-web3~=0.5.1
+Requires-Dist: mm-web3~=0.5.4
 Requires-Dist: mnemonic==0.21
 Requires-Dist: socksio>=1.0.0
-Requires-Dist: solana~=0.36.7
-Requires-Dist: typer>=0.16.0
+Requires-Dist: solana~=0.36.9
+Requires-Dist: typer>=0.16.1

{mm_sol-0.7.1 → mm_sol-0.7.3}/README.md

@@ -1,5 +1,5 @@
 # mm-sol
-A Python library and cli tool for interacting with Solana blockchain. It's based on https://github.com/michaelhly/solana-py 
+A Python library and cli tool for interacting with Solana blockchain. It's based on https://github.com/michaelhly/solana-py
 
 ### Install on Ubuntu
 ```shell
@@ -10,4 +10,4 @@ uv tool install mm-sol
 ```
 
 ### Notes
-- AsyncClient from solana-py with socks5 proxy ignores timeout. Use http proxy. 
+- AsyncClient from solana-py with socks5 proxy ignores timeout. Use http proxy.

{mm_sol-0.7.1 → mm_sol-0.7.3}/justfile

@@ -15,13 +15,10 @@ format:
 test:
     uv run pytest -n auto tests
 
-lint: format
-    uv run ruff check src tests
+lint *args: format pre-commit
+    uv run ruff check {{args}} src tests
     uv run mypy src
 
-lint-fix: format
-    uv run ruff check --fix src tests
-
 audit:
     uv export --no-dev --all-extras --format requirements-txt --no-emit-project > requirements.txt
     uv run pip-audit -r requirements.txt --disable-pip
@@ -36,3 +33,9 @@ publish: build
 
 sync:
     uv sync
+
+pre-commit:
+    uv run pre-commit run --all-files
+
+pre-commit-autoupdate:
+    uv run pre-commit autoupdate

{mm_sol-0.7.1 → mm_sol-0.7.3}/pyproject.toml

@@ -1,14 +1,14 @@
 [project]
 name = "mm-sol"
-version = "0.7.1"
+version = "0.7.3"
 description = ""
 requires-python = ">=3.13"
 dependencies = [
-    "mm-web3~=0.5.1",
-    "solana~=0.36.7",
+    "mm-web3~=0.5.4",
+    "solana~=0.36.9",
     "base58~=2.1.1",
     "mnemonic==0.21",
-    "typer>=0.16.0",
+    "typer>=0.16.1",
     "jinja2>=3.1.6",
     "socksio>=1.0.0",
 ]
@@ -19,16 +19,17 @@ mm-sol = "mm_sol.cli.cli:app"
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[tool.uv]
-dev-dependencies = [
-    "pytest~=8.4.0",
-    "pytest-asyncio~=1.0.0",
-    "pytest-xdist~=3.7.0",
-    "ruff~=0.11.13",
+[dependency-groups]
+dev = [
+    "pytest~=8.4.2",
+    "pytest-asyncio~=1.2.0",
+    "pytest-xdist~=3.8.0",
+    "ruff~=0.14.2",
     "pip-audit~=2.9.0",
-    "bandit~=1.8.3",
-    "mypy~=1.16.0",
-    "python-dotenv>=1.1.0",
+    "bandit~=1.8.6",
+    "mypy~=1.18.2",
+    "pre-commit~=4.3.0",
+    "python-dotenv~=1.2.1",
 ]
 
 [tool.mypy]

{mm_sol-0.7.1 → mm_sol-0.7.3}/src/mm_sol/cli/cmd/balances_cmd.py

@@ -35,7 +35,7 @@ async def run(config_path: Path, print_config: bool) -> None:
         for token_address in config.tokens:
             res = await mm_sol.retry.get_token_decimals(3, config.nodes, config.proxies, token=token_address)
             if res.is_err():
-                mm_print.fatal(f"Failed to get decimals for token {token_address}: {res.unwrap_err()}")
+                mm_print.exit_with_error(f"Failed to get decimals for token {token_address}: {res.unwrap_err()}")
 
             token_decimals = res.unwrap()
             result[token_address] = await _get_token_balances(token_address, token_decimals, config.accounts, config)

{mm_sol-0.7.1 → mm_sol-0.7.3}/src/mm_sol/cli/cmd/example_cmd.py

@@ -5,4 +5,4 @@ import mm_print
 
 def run(module: str) -> None:
     example_file = Path(Path(__file__).parent.absolute(), "../examples", f"{module}.toml")
-    mm_print.toml(toml=example_file.read_text())
+    mm_print.toml(example_file.read_text())

{mm_sol-0.7.1 → mm_sol-0.7.3}/src/mm_sol/cli/cmd/transfer_cmd.py

@@ -69,7 +69,7 @@ class Config(Web3CliConfig):
         if self.token:
             res = await mm_sol.retry.get_token_decimals(3, self.nodes, self.proxies, token=self.token)
             if res.is_err():
-                mm_print.fatal(f"can't get decimals for token={self.token}, error={res.unwrap_err()}")
+                mm_print.exit_with_error(f"can't get decimals for token={self.token}, error={res.unwrap_err()}")
             self.token_decimals = res.unwrap()
 
         return self

{mm_sol-0.7.1 → mm_sol-0.7.3}/src/mm_sol/cli/examples/balances.toml

@@ -9,4 +9,4 @@ JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN # JUP
 """
 
 nodes = "https://api.mainnet-beta.solana.com"
-# proxies = "env_url: MM_SOL_PROXIES_URL"
+# proxies = "env_url: MM_SOL_PROXIES_URL"

{mm_sol-0.7.1 → mm_sol-0.7.3}/src/mm_sol/cli/examples/transfer.toml

@@ -3,7 +3,7 @@
 # value is an expression that can contain variable 'balance' and 'random' function
 transfers = """
 # for sol transfer use 'sol' suffix, example: 1.2sol. For other tokens use 't' suffix, example: 1.2t
-Bd8CxCTLez2ckVTqEJjuZkWjYFSRbo8fA1qYbd7yFVP9 Eaft9xXzfgbRqsHd65WspoaxTtH7pkznM9YA8tsDKGwj 1.2t 
+Bd8CxCTLez2ckVTqEJjuZkWjYFSRbo8fA1qYbd7yFVP9 Eaft9xXzfgbRqsHd65WspoaxTtH7pkznM9YA8tsDKGwj 1.2t
 Fc2TRJVCpFZpRz56mFnQETctib1zwFnwHcS7HoQSgUzZ EVJctTWikt29rUXBf49tyQdK87x837HtvpCwqeSjp1Ur 0.6balance-random(1t,2.50t)-100
 6TW4WswDgGmEB5HELBtEdwC1tQJq9Xa1msDjPw94sgai GGb7gb5EzW8GZZWX552eiC9r1SY4Pqtgbqf9UMrBrEzy # default_value will be used
 file: /path/to/other/transfers.txt # transfers from this file will be added

{mm_sol-0.7.1 → mm_sol-0.7.3}/src/mm_sol/rpc.py

@@ -26,7 +26,7 @@ async def _http_call(node: str, data: dict[str, object], timeout: float, proxy:
     if res.is_err():
         return res.to_result_err()
     try:
-        parsed_body = res.parse_json_body()
+        parsed_body = res.parse_json()
         err = parsed_body.get("error", {}).get("message", "")
         if err:
             return res.to_result_err(f"service_error: {err}")

{mm_sol-0.7.1 → mm_sol-0.7.3}/src/mm_sol/rpc_sync.py

@@ -95,7 +95,7 @@ def _http_call(node: str, data: dict[str, object], timeout: float, proxy: str |
         if res.is_err():
             return res.to_result_err()
 
-        json_body = res.parse_json_body()
+        json_body = res.parse_json()
         err = pydash.get(json_body, "error.message")
         if err:
             return res.to_result_err(f"service_error: {err}")

{mm_sol-0.7.1 → mm_sol-0.7.3}/tests/conftest.py

@@ -99,14 +99,6 @@ def binance_wallet():
     return "2ojv9BAiHUrvsm9gxDe7fJSzbNZSJcxZvf8dqmWGHG8S"
 
 
-@pytest.fixture
-def proxy() -> str:
-    value = os.getenv("PROXY")
-    if value is None:
-        pytest.skip("PROXY environment variable not set")
-    return value
-
-
 @pytest.fixture(scope="session")
 def proxies() -> list[str]:
     proxies_url = os.getenv("PROXIES_URL")

mm_sol-0.7.3/tests/test_client.py

@@ -0,0 +1,6 @@
+from mm_sol.utils import get_client
+
+
+def test_proxy_client(mainnet_node, random_proxy):
+    client = get_client(mainnet_node, proxy=random_proxy)
+    assert client.get_block_height().value > 10_000_000

{mm_sol-0.7.1 → mm_sol-0.7.3}/tests/test_converters.py

@@ -17,7 +17,7 @@ def test_sol_to_lamports():
 
 def test_to_lamports():
     assert to_lamports(123) == 123
-    assert to_lamports(Decimal("123")) == 123
+    assert to_lamports(Decimal(123)) == 123
     assert to_lamports("123") == 123
     assert to_lamports("123.1 sol") == 123.1 * 10**9
     assert to_lamports("123.1sol") == 123.1 * 10**9