mm-sol 0.6.1__py3-none-any.whl → 0.6.2__py3-none-any.whl

mm_sol/cli/cmd/node_cmd.py

@@ -7,5 +7,5 @@ from mm_sol.cli import cli_utils
 async def run(urls: list[str], proxy: str | None) -> None:
     result = {}
     for url in [cli_utils.public_rpc_url(u) for u in urls]:
-        result[url] = (await rpc.get_block_height(url, proxy=proxy, timeout=10)).ok_or_error()
+        result[url] = (await rpc.get_block_height(url, proxy=proxy, timeout=10)).value_or_error()
     print_json(data=result)

mm_sol/cli/cmd/transfer_cmd.py

@@ -130,7 +130,7 @@ async def _calc_value(transfer: Transfer, config: Config, transfer_sol_fee: int)
             proxies=config.proxies,
             fee=transfer_sol_fee,
         )
-    logger.debug(f"{transfer.log_prefix}: value={value_res.ok_or_error()}")
+    logger.debug(f"{transfer.log_prefix}: value={value_res.value_or_error()}")
     if value_res.is_err():
         logger.info(f"{transfer.log_prefix}: calc value error, {value_res.unwrap_error()}")
 
@@ -256,11 +256,11 @@ async def _print_balances(config: Config) -> None:
 
 async def _get_sol_balance_str(address: str, config: Config) -> str:
     res = await retry.get_sol_balance(5, config.nodes, config.proxies, address=address)
-    return res.map(lambda ok: str(lamports_to_sol(ok, config.round_ndigits))).ok_or_error()
+    return res.map(lambda ok: str(lamports_to_sol(ok, config.round_ndigits))).value_or_error()
 
 
 async def _get_token_balance_str(address: str, config: Config) -> str:
     if not config.token:
         raise ValueError("token is not set")
     res = await mm_sol.retry.get_token_balance(5, config.nodes, config.proxies, owner=address, token=config.token)
-    return res.map(lambda ok: str(to_token(ok, config.token_decimals, ndigits=config.round_ndigits))).ok_or_error()
+    return res.map(lambda ok: str(to_token(ok, config.token_decimals, ndigits=config.round_ndigits))).value_or_error()

mm_sol/rpc.py

@@ -23,17 +23,17 @@ async def rpc_call(
 async def _http_call(node: str, data: dict[str, object], timeout: float, proxy: str | None) -> Result[Any]:
     res = await http_request(node, method="POST", proxy=proxy, timeout=timeout, json=data)
     if res.is_err():
-        return res.to_err_result()
+        return res.to_err()
     try:
         parsed_body = res.parse_json_body()
         err = parsed_body.get("error", {}).get("message", "")
         if err:
-            return res.to_err_result(f"service_error: {err}")
+            return res.to_err(f"service_error: {err}")
         if "result" in parsed_body:
-            return res.to_ok_result(parsed_body["result"])
-        return res.to_err_result("unknown_response")
+            return res.to_ok(parsed_body["result"])
+        return res.to_err("unknown_response")
     except Exception as e:
-        return res.to_err_result(e)
+        return res.to_err(e)
 
 
 async def _ws_call(node: str, data: dict[str, object], timeout: float) -> Result[Any]:

mm_sol/rpc_sync.py

@@ -92,18 +92,18 @@ def _http_call(node: str, data: dict[str, object], timeout: float, proxy: str |
     res = http_request_sync(node, method="POST", proxy=proxy, timeout=timeout, json=data)
     try:
         if res.is_err():
-            return res.to_err_result()
+            return res.to_err()
 
         json_body = res.parse_json_body()
         err = pydash.get(json_body, "error.message")
         if err:
-            return res.to_err_result(f"service_error: {err}")
+            return res.to_err(f"service_error: {err}")
         if "result" in json_body:
-            return res.to_ok_result(json_body["result"])
+            return res.to_ok(json_body["result"])
 
-        return res.to_err_result("unknown_response")
+        return res.to_err("unknown_response")
     except Exception as e:
-        return res.to_err_result(e)
+        return res.to_err(e)
 
 
 def get_balance(node: str, address: str, timeout: float = 10, proxy: str | None = None) -> Result[int]:

{mm_sol-0.6.1.dist-info → mm_sol-0.6.2.dist-info}/METADATA

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

{mm_sol-0.6.1.dist-info → mm_sol-0.6.2.dist-info}/RECORD

@@ -4,8 +4,8 @@ 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/retry.py,sha256=9ejCcrHbJFOcZVKdbUASynLs1YHw04VAIKGH8mIJ1OI,2894
-mm_sol/rpc.py,sha256=sYZ6y47qQa2WOHul9H3gcM4tJ61Z2yy6UpITR2DnX8s,2457
-mm_sol/rpc_sync.py,sha256=vxWh1nmTgDelvfBDo9haxQmpDnXFZzeInsKIw3LLyy0,7183
+mm_sol/rpc.py,sha256=LhXrHIz58iOG2ES8m67ycBCwkJx-4pLBuDt6Hsq6OkM,2422
+mm_sol/rpc_sync.py,sha256=A06MTSFQ7UUJgm0fy4a6ipqqY2vdDwS07UGXkdrvqWw,7148
 mm_sol/spl_token.py,sha256=hEWVch17EdudlL_tj3ZInCa9wB0iK8hwwpFucmVi7Pc,1941
 mm_sol/transfer.py,sha256=6CXzeMe91JtG8SuTadYQ-DLHJFyskytmBItGVEPh7Os,4410
 mm_sol/utils.py,sha256=oD06NsMSMhN6lqsM6mSgLTtiKwA1uAsen9WR82ofRTE,923
@@ -18,14 +18,14 @@ mm_sol/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/cli/cmd/balance_cmd.py,sha256=ot6X7gTSoMcjapVkAgDlA9Wyo4YeFBIRA7GLjTXsu98,2469
 mm_sol/cli/cmd/balances_cmd.py,sha256=XNNyU02mvSxPdfD3usxucNiiHagxSnLe1rKihj-ya78,2676
 mm_sol/cli/cmd/example_cmd.py,sha256=ZLTy1-cmapiCyYvjFInVE-pQCGKZzDgYKUhsOwtbSIY,234
-mm_sol/cli/cmd/node_cmd.py,sha256=xKjaMdv3_C4kePo-exjE4dQqUHtHWC4eHGROWLkWpS0,347
-mm_sol/cli/cmd/transfer_cmd.py,sha256=Q1GvT1NPDqOESZwfwPYnLqOSQ_VNJCj9ihi7hZhj8xw,10913
+mm_sol/cli/cmd/node_cmd.py,sha256=o3YktYk4o_ya8srN_It2BITam4HlpFMK11ajYNTGuKA,350
+mm_sol/cli/cmd/transfer_cmd.py,sha256=8QMfqUcvS63V_AeEvlvsuIEZIv_ydrMtuCOr4LvcyoY,10922
 mm_sol/cli/cmd/wallet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/cli/cmd/wallet/keypair_cmd.py,sha256=cRHVVTs9zNYmUozZ8ZlJoutn9V6r8I1AEHBrszR7dTE,538
 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.6.1.dist-info/METADATA,sha256=SQ0YVupNyQKaMg7eZ7_NWj6u2oU63HL-ExQztVQbW3c,320
-mm_sol-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_sol-0.6.1.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
-mm_sol-0.6.1.dist-info/RECORD,,
+mm_sol-0.6.2.dist-info/METADATA,sha256=H01qTQ1WZUC-TNzgDPimXXZpIFZVVcf6CvuvmeE6UsQ,320
+mm_sol-0.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.6.2.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.6.2.dist-info/RECORD,,