mm-sol 0.5.5__py3-none-any.whl → 0.5.7__py3-none-any.whl

mm_sol/account.py

@@ -51,7 +51,7 @@ def derive_accounts(mnemonic: str, passphrase: str, derivation_path: str, limit:
                 index=i,
                 path=path,
                 address=str(keypair.pubkey()),
-                private_key=base58.b58encode(bytes(keypair.to_bytes_array())).decode("utf-8"),
+                private_key=base58.b58encode(bytes(keypair.to_bytes())).decode("utf-8"),
             )
         )
 
@@ -61,8 +61,8 @@ def derive_accounts(mnemonic: str, passphrase: str, derivation_path: str, limit:
 def generate_account() -> NewAccount:
     keypair = Keypair()
     public_key = str(keypair.pubkey())
-    private_key_base58 = base58.b58encode(bytes(keypair.to_bytes_array())).decode("utf-8")
-    private_key_arr = list(keypair.to_bytes_array())
+    private_key_base58 = base58.b58encode(bytes(keypair.to_bytes())).decode("utf-8")
+    private_key_arr = list(keypair.to_bytes())
     return NewAccount(public_key=public_key, private_key_base58=private_key_base58, private_key_arr=private_key_arr)
 
 
@@ -93,12 +93,12 @@ def get_public_key(private_key: str) -> str:
 
 def get_private_key_base58(private_key: str) -> str:
     keypair = get_keypair(private_key)
-    return base58.b58encode(bytes(keypair.to_bytes_array())).decode("utf-8")
+    return base58.b58encode(bytes(keypair.to_bytes())).decode("utf-8")
 
 
 def get_private_key_arr(private_key: str) -> list[int]:
     keypair = get_keypair(private_key)
-    return list(x for x in keypair.to_bytes_array())  # noqa: C400
+    return list(x for x in keypair.to_bytes())  # noqa: C400
 
 
 def get_private_key_arr_str(private_key: str) -> str:

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/balance.py

@@ -63,10 +63,8 @@ def get_token_balance(
             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)
+        if "could not find account" in str(e):
+            return Ok(0)
         return Err(e)
     except httpx.HTTPStatusError as e:
         return Err(f"http error: {e}")
@@ -98,11 +96,10 @@ async def get_token_balance_async(
             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)
+        if "could not find account" in str(e):
+            return Ok(0)
         return Err(e)
+
     except httpx.HTTPStatusError as e:
         return Err(f"http error: {e}")
     except SolanaRpcException as e:

{mm_sol-0.5.5.dist-info → mm_sol-0.5.7.dist-info}/METADATA

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.5.5
+Version: 0.5.7
 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.10
 Requires-Dist: mnemonic==0.21
 Requires-Dist: socksio>=1.0.0
 Requires-Dist: solana~=0.36.6
+Requires-Dist: solders~=0.26.0
 Requires-Dist: typer>=0.15.2

{mm_sol-0.5.5.dist-info → mm_sol-0.5.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mm_sol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_sol/account.py,sha256=0pjvNxwhpmDHoXY3oTY2fNlQHoWPmlS77r8JcP8lAy4,4545
-mm_sol/async_rpc.py,sha256=VpAovAgtDT-5OmwGyT8b-Ky_EtrGPKENKxZGGnw3_D8,1406
-mm_sol/balance.py,sha256=cMn9y0StOUwQM3Je4so6AoFCy3lS0JpaiEk-TnUp0Q4,5321
+mm_sol/account.py,sha256=9aDP5si-QJfSF8fz8K6geGUGh9GL83YJNkdU1qd4Xu8,4515
+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
@@ -27,7 +27,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.5.dist-info/METADATA,sha256=90sfCL0vDIivEZTDRLHZGgu9leQSarrcyLQq3Th-yxo,289
-mm_sol-0.5.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_sol-0.5.5.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
-mm_sol-0.5.5.dist-info/RECORD,,
+mm_sol-0.5.7.dist-info/METADATA,sha256=MJOqW-BVrNMi3RavsdDHLv3_HwlGqH_7pYJQvNv1O6o,321
+mm_sol-0.5.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.5.7.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.5.7.dist-info/RECORD,,