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

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/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.dist-info → mm_sol-0.5.9.dist-info}/METADATA

@@ -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.dist-info → mm_sol-0.5.9.dist-info}/RECORD

@@ -7,10 +7,10 @@ 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/rpc_async.py,sha256=_cKqyd5oLArm9VWWuYNqq2PbkqEu7KrsH2r4IAEevGY,2476
 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/token_async.py,sha256=6IWlQOnyTWA2e3_bccxa10Y4BhbgQpXUAS1NrTyw67E,1572
 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
@@ -29,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.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,,
+mm_sol-0.5.9.dist-info/METADATA,sha256=rPkIVLM-UIwT_o9HLo8E_EqputbOZ44gfIGxw8_rstA,321
+mm_sol-0.5.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.5.9.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.5.9.dist-info/RECORD,,