mm-sol 0.5.8__tar.gz → 0.5.9__tar.gz

{mm_sol-0.5.8 → mm_sol-0.5.9}/PKG-INFO

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

{mm_sol-0.5.8 → mm_sol-0.5.9}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "mm-sol"
-version = "0.5.8"
+version = "0.5.9"
 description = ""
 requires-python = ">=3.12"
 dependencies = [
-    "mm-crypto-utils>=0.2.13",
+    "mm-crypto-utils>=0.2.15",
     "solana~=0.36.6",
     "solders~=0.26.0",
     "base58~=2.1.1",
@@ -12,7 +12,6 @@ dependencies = [
     "typer>=0.15.2",
     "jinja2>=3.1.6",
     "socksio>=1.0.0",
-#    "websockets~=15.0.1"
 ]
 [project.scripts]
 mm-sol = "mm_sol.cli.cli:app"

{mm_sol-0.5.8 → mm_sol-0.5.9}/src/mm_sol/rpc_async.py

@@ -44,14 +44,14 @@ async def _ws_call(node: str, data: dict[str, object], timeout: float) -> DataRe
 
         err = response.get("error", {}).get("message", "")
         if err:
-            return DataResult(err=f"service_error: {err}", data=response)
+            return DataResult.err(f"service_error: {err}", {"res": response})
         if "result" in response:
-            return DataResult(ok=response["result"], data=response)
-        return DataResult(err="unknown_response", data=response)
+            return DataResult.ok(response["result"], {"res": response})
+        return DataResult.err("unknown_response", {"res": response})
     except TimeoutError:
-        return DataResult(err="timeout")
+        return DataResult.err("timeout")
     except Exception as err:
-        return DataResult(err=f"exception: {err}")
+        return DataResult.exception(err)
 
 
 async def get_block_height(node: str, timeout: float = 10, proxy: str | None = None) -> DataResult[int]:

{mm_sol-0.5.8 → mm_sol-0.5.9}/src/mm_sol/token_async.py

@@ -26,15 +26,15 @@ async def get_token_balance(
 
         # 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)})
+            return DataResult.ok(0, {"res": res.to_json()})
+        return DataResult.ok(int(res.value.amount), {"res": res.to_json()})
+    except RPCException as err:
+        if "could not find account" in str(err):
+            return DataResult.ok(0, {"rpc_exception": str(err)})
+        return DataResult.exception(err)
+    except httpx.HTTPStatusError as err:
+        return DataResult.err(f"http error: {err}")
+    except SolanaRpcException as err:
+        return DataResult.err(err.error_msg)
+    except Exception as err:
+        return DataResult.exception(err)

{mm_sol-0.5.8 → mm_sol-0.5.9}/uv.lock

@@ -562,19 +562,19 @@ wheels = [
 
 [[package]]
 name = "mm-crypto-utils"
-version = "0.2.13"
+version = "0.2.15"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "loguru" },
     { name = "mm-std" },
 ]
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/84/00/5bf801eba9d5af8f4bb330993db85c12dec8df13b15e984d83ffccbc60ce/mm_crypto_utils-0.2.13-py3-none-any.whl", hash = "sha256:dc79cf3767ca1a9f56900d1a2b9c1d8016e6334026fa27271b4fd109fae9ff72", size = 9708 },
+    { url = "https://files.pythonhosted.org/packages/71/2d/d454b33604f43efeea62fe2830933bc666cdd7d1e47c5904671b4ddcc836/mm_crypto_utils-0.2.15-py3-none-any.whl", hash = "sha256:a87560b5314d8cf6b387d9330d5d47ea10bd3073d5d5f43e54b1e10a4f0a799e", size = 9708 },
 ]
 
 [[package]]
 name = "mm-sol"
-version = "0.5.8"
+version = "0.5.9"
 source = { editable = "." }
 dependencies = [
     { name = "base58" },
@@ -601,7 +601,7 @@ dev = [
 requires-dist = [
     { name = "base58", specifier = "~=2.1.1" },
     { name = "jinja2", specifier = ">=3.1.6" },
-    { name = "mm-crypto-utils", specifier = ">=0.2.13" },
+    { name = "mm-crypto-utils", specifier = ">=0.2.15" },
     { name = "mnemonic", specifier = "==0.21" },
     { name = "socksio", specifier = ">=1.0.0" },
     { name = "solana", specifier = "~=0.36.6" },
@@ -621,12 +621,13 @@ dev = [
 
 [[package]]
 name = "mm-std"
-version = "0.3.29"
+version = "0.3.30"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "aiohttp" },
     { name = "aiohttp-socks" },
     { name = "cryptography" },
+    { name = "multidict" },
     { name = "pydantic" },
     { name = "pydantic-settings" },
     { name = "pydash" },
@@ -636,7 +637,7 @@ dependencies = [
     { name = "tomlkit" },
 ]
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/da/9e/8770e2e05e7276307c9159148bb034addf735d33937fdae904ff2df4df7f/mm_std-0.3.29-py3-none-any.whl", hash = "sha256:35904c4e891d8ee6ad47dcb847bd3e5124c595ba284e46d3ad00b7d3cbf89256", size = 26542 },
+    { url = "https://files.pythonhosted.org/packages/4f/44/639f0d9b9663c7a8357b13668c31dfbf3b0e0c7aa617f072757a1b53ecbc/mm_std-0.3.30-py3-none-any.whl", hash = "sha256:2ea26c9f3850fc47ba4873bebb3ffaa17c0b1d991f7c7d890f688e0e76730dbc", size = 26624 },
 ]
 
 [[package]]