mm-sol 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

mm_sol/transfer.py

@@ -1,66 +1,165 @@
 from decimal import Decimal
 
+import mm_crypto_utils
 import pydash
+from mm_crypto_utils import Nodes, Proxies
 from mm_std import Err, Ok, Result
 from pydantic import BaseModel
-from solana.rpc.api import Client
 from solders.message import Message
 from solders.pubkey import Pubkey
+from solders.signature import Signature
 from solders.system_program import TransferParams, transfer
 from solders.transaction import Transaction
+from spl.token.client import Token
+from spl.token.constants import TOKEN_PROGRAM_ID
+from spl.token.instructions import get_associated_token_address
 
+import mm_sol.converters
 from mm_sol import rpc, utils
 from mm_sol.account import check_private_key, get_keypair
 
 
+def transfer_token(
+    *,
+    node: str,
+    token_mint_address: str | Pubkey,
+    from_address: str | Pubkey,
+    private_key: str,
+    to_address: str | Pubkey,
+    amount: Decimal,
+    decimals: int,
+    proxy: str | None = None,
+    timeout: float = 10,
+    create_token_account_if_not_exists: bool = True,
+) -> Result[Signature]:
+    acc = get_keypair(private_key)
+    if not check_private_key(from_address, private_key):
+        return Err("invalid_private_key")
+
+    from_address = utils.pubkey(from_address)
+    token_mint_address = utils.pubkey(token_mint_address)
+    to_address = utils.pubkey(to_address)
+
+    client = utils.get_client(node, proxy=proxy, timeout=timeout)
+    token_client = Token(conn=client, pubkey=token_mint_address, program_id=TOKEN_PROGRAM_ID, payer=acc)
+
+    recipient_token_account = get_associated_token_address(to_address, token_mint_address, token_program_id=TOKEN_PROGRAM_ID)
+    from_token_account = get_associated_token_address(from_address, token_mint_address, token_program_id=TOKEN_PROGRAM_ID)
+
+    data: list[object] = []
+
+    account_info_res = client.get_account_info(recipient_token_account)
+    if account_info_res.value is None:
+        if create_token_account_if_not_exists:
+            create_account_res = token_client.create_account(to_address, skip_confirmation=False)
+            data.append(create_account_res)
+        else:
+            return Err("no_token_account")
+
+    res = token_client.transfer_checked(
+        source=from_token_account,
+        dest=recipient_token_account,
+        owner=from_address,
+        amount=mm_sol.converters.sol_to_lamports(amount),
+        decimals=decimals,
+    )
+    data.append(res)
+
+    return Ok(res.value, data=data)
+
+
+def transfer_token_with_retries(
+    *,
+    nodes: Nodes,
+    token_mint_address: str | Pubkey,
+    from_address: str | Pubkey,
+    private_key: str,
+    to_address: str | Pubkey,
+    amount: Decimal,
+    decimals: int,
+    proxies: Proxies = None,
+    timeout: float = 10,
+    retries: int = 3,
+) -> Result[Signature]:
+    res: Result[Signature] = Err("not started yet")
+    for _ in range(retries):
+        res = transfer_token(
+            node=mm_crypto_utils.random_node(nodes),
+            token_mint_address=token_mint_address,
+            from_address=from_address,
+            private_key=private_key,
+            to_address=to_address,
+            amount=amount,
+            decimals=decimals,
+            proxy=mm_crypto_utils.random_proxy(proxies),
+            timeout=timeout,
+        )
+        if res.is_ok():
+            return res
+    return res
+
+
 def transfer_sol(
     *,
+    node: str,
     from_address: str,
-    private_key_base58: str,
-    recipient_address: str,
-    amount_sol: Decimal,
-    nodes: str | list[str] | None = None,
-    attempts: int = 3,
-) -> Result[str]:
-    acc = get_keypair(private_key_base58)
-    if not check_private_key(from_address, private_key_base58):
-        raise ValueError("from_address or private_key_base58 is invalid")
-
-    lamports = int(amount_sol * 10**9)
-    error = None
+    private_key: str,
+    to_address: str,
+    lamports: int,
+    proxy: str | None = None,
+    timeout: float = 10,
+) -> Result[Signature]:
+    acc = get_keypair(private_key)
+    if not check_private_key(from_address, private_key):
+        return Err("invalid_private_key")
+
+    client = utils.get_client(node, proxy=proxy, timeout=timeout)
     data = None
-    for _ in range(attempts):
-        try:
-            client = Client(utils.get_node(nodes))
-            # tx = Transaction(from_keypairs=[acc])
-            # ti = transfer(
-            #     TransferParams(from_pubkey=acc.pubkey(), to_pubkey=Pubkey.from_string(recipient_address), lamports=lamports),
-            # )
-            # tx.add(ti)
-            # res = client.send_legacy_transaction(tx, acc)
-            ixns = [
-                transfer(
-                    TransferParams(from_pubkey=acc.pubkey(), to_pubkey=Pubkey.from_string(recipient_address), lamports=lamports)
-                )
-            ]
-            msg = Message(ixns, acc.pubkey())
-            tx = Transaction([acc], msg, client.get_latest_blockhash().value.blockhash)
-            res = client.send_transaction(tx)
-            data = res.to_json()
-            return Ok(str(res.value), data=data)
-        except Exception as e:
-            error = e
-
-    return Err(error or "unknown", data=data)
-
-
-class TransferInfo(BaseModel):
+    try:
+        ixs = [transfer(TransferParams(from_pubkey=acc.pubkey(), to_pubkey=Pubkey.from_string(to_address), lamports=lamports))]
+        msg = Message(ixs, acc.pubkey())
+        tx = Transaction([acc], msg, client.get_latest_blockhash().value.blockhash)
+        res = client.send_transaction(tx)
+        data = res.to_json()
+        return Ok(res.value, data=data)
+    except Exception as e:
+        return Err(e, data=data)
+
+
+def transfer_sol_with_retries(
+    *,
+    nodes: Nodes,
+    from_address: str,
+    private_key: str,
+    to_address: str,
+    lamports: int,
+    proxies: Proxies = None,
+    timeout: float = 10,
+    retries: int = 3,
+) -> Result[Signature]:
+    res: Result[Signature] = Err("not started yet")
+    for _ in range(retries):
+        res = transfer_sol(
+            node=mm_crypto_utils.random_node(nodes),
+            from_address=from_address,
+            private_key=private_key,
+            to_address=to_address,
+            lamports=lamports,
+            proxy=mm_crypto_utils.random_proxy(proxies),
+            timeout=timeout,
+        )
+        if res.is_ok():
+            return res
+    return res
+
+
+class SolTransferInfo(BaseModel):
     source: str
     destination: str
     lamports: int
 
 
-def find_transfers(node: str, tx_signature: str) -> Result[list[TransferInfo]]:
+def find_sol_transfers(node: str, tx_signature: str) -> Result[list[SolTransferInfo]]:
     res = rpc.get_transaction(node, tx_signature, encoding="jsonParsed")
     if res.is_err():
         return res  # type: ignore[return-value]
@@ -74,7 +173,7 @@ def find_transfers(node: str, tx_signature: str) -> Result[list[TransferInfo]]:
                 destination = pydash.get(ix, "parsed.info.destination")
                 lamports = pydash.get(ix, "parsed.info.lamports")
                 if source and destination and lamports:
-                    result.append(TransferInfo(source=source, destination=destination, lamports=lamports))
+                    result.append(SolTransferInfo(source=source, destination=destination, lamports=lamports))
         return Ok(result, data=res.data)
     except Exception as e:
         return Err(e, res.data)

mm_sol/utils.py

@@ -1,31 +1,6 @@
-import random
-from decimal import Decimal
-
 from solana.rpc.api import Client
 from solana.rpc.commitment import Commitment
-
-from mm_sol.rpc import DEFAULT_MAINNET_RPC
-from mm_sol.types import Nodes, Proxies
-
-
-def lamports_to_sol(lamports: int, ndigits: int = 4) -> Decimal:
-    return Decimal(str(round(lamports / 10**9, ndigits=ndigits)))
-
-
-def get_node(nodes: Nodes | None = None) -> str:
-    if nodes is None:
-        return DEFAULT_MAINNET_RPC
-    if isinstance(nodes, str):
-        return nodes
-    return random.choice(nodes)
-
-
-def get_proxy(proxies: Proxies) -> str | None:
-    if not proxies:
-        return None
-    if isinstance(proxies, str):
-        return proxies
-    return random.choice(proxies)
+from solders.pubkey import Pubkey
 
 
 def get_client(
@@ -36,3 +11,9 @@ def get_client(
     timeout: float = 10,
 ) -> Client:
     return Client(endpoint, commitment=commitment, extra_headers=extra_headers, timeout=timeout, proxy=proxy)
+
+
+def pubkey(value: str | Pubkey) -> Pubkey:
+    if isinstance(value, Pubkey):
+        return value
+    return Pubkey.from_string(value)

{mm_sol-0.2.5.dist-info → mm_sol-0.2.7.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.2.5
-Requires-Python: >=3.12
+Version: 0.2.7
+Requires-Python: >=3.13
 Requires-Dist: base58~=2.1.1
 Requires-Dist: jinja2>=3.1.5
-Requires-Dist: mm-std~=0.1.12
-Requires-Dist: solana~=0.36.2
+Requires-Dist: mm-crypto-utils>=0.0.15
+Requires-Dist: solana~=0.36.3
 Requires-Dist: typer>=0.15.1

mm_sol-0.2.7.dist-info/RECORD

@@ -0,0 +1,32 @@
+mm_sol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_sol/account.py,sha256=32PR3kAoZJLEtKzwfWeQXnMxZeFO8NVXjG8HnHpnJgM,3225
+mm_sol/balance.py,sha256=Idx7h9yhRLbrIEDFCBI5QSHE7OT2pYWEZrbHj9XFrkM,3147
+mm_sol/block.py,sha256=4Lc4TANgpGvPflVumC9MR-3vIl1dedGyci3cgzczuds,1794
+mm_sol/converters.py,sha256=jY3wZeo1326z8M-AMS4OEzspRaGt4Tbk0y2SPI-oDFE,1153
+mm_sol/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_sol/rpc.py,sha256=TspD_KZQp_KJDQzRknxaT8DR03okok26UWDQWF7Zflg,8031
+mm_sol/solana_cli.py,sha256=ig3OoTvmkrl7MFQSZjRHIraLSmtse0_9kn5Nsw8_zb0,8258
+mm_sol/token.py,sha256=O8z3UE3iZGYLWw8fnd9weYMcoQO0m88noqbRO_jntGg,1092
+mm_sol/transfer.py,sha256=-76gSHbQGOZeOgVgo10QWjAcv_9mnGrBNvpRCvXBlZQ,5872
+mm_sol/utils.py,sha256=NE0G564GiT9d7rW_lPPxUb1eq62WiXh28xtvtzNQIqw,556
+mm_sol/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_sol/cli/calcs.py,sha256=jtFTODBHOkeSR5SARksQ7dDw2BATQYdhc8PtUskfEPk,4152
+mm_sol/cli/cli.py,sha256=SZwvxbiEXHgnhZ_Zg7GsgOm0Y2-WYHSQSuaO2xTaOnk,4496
+mm_sol/cli/cli_utils.py,sha256=EJTWdccXg8mvkK7E-Dt7zmULzc1WoqFlbu8ASGT2SVI,1381
+mm_sol/cli/validators.py,sha256=uKAZfKx4a11kLnxnD98duCMUEswj9UTJkWVVjlW0cDw,500
+mm_sol/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_sol/cli/cmd/balance_cmd.py,sha256=DfUZY3-Hr-F7Y0xp1faol0yLnPu6iDU3b839VhdwAbw,2587
+mm_sol/cli/cmd/balances_cmd.py,sha256=yfiRMR3inxz0eXKR4rC9Ii8XsED_3mn46LX_C6Zf0MA,2624
+mm_sol/cli/cmd/example_cmd.py,sha256=bK_z4du0UPGAoiHnYdi6iaZim_kKlYw4NKBbzvyes28,221
+mm_sol/cli/cmd/node_cmd.py,sha256=2AEAjq2M9f8-RZiI0rif6wITdns9QUb4Kr34QPsI2CA,238
+mm_sol/cli/cmd/transfer_sol_cmd.py,sha256=BmPCKr9D1rc7EQ9fuuShlrhiYYli1v1EHY3gkygrFJU,7083
+mm_sol/cli/cmd/transfer_token_cmd.py,sha256=bfDhy0s1i9qaXeGWLk1CnSnxS6wJKdDAM4f3f07RWJA,5148
+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/new_cmd.py,sha256=hcP9NZPkwYkTBEvT5rBntFtCIvx1QnPGn5FUDnvz5sM,425
+mm_sol/cli/examples/balances.yml,sha256=SoFcf_IhgA2zrbihrVpqm-ikes80wLFGVzafrjO00UY,290
+mm_sol/cli/examples/transfer-sol.yml,sha256=YFIM36NhaSEPeck6yQMvcgy3MWxgsfDqmMLRqz6P1dk,346
+mm_sol-0.2.7.dist-info/METADATA,sha256=7vvn9NEvyV0s-z6iQ1xVNW3pJwps9XBKspM_8qUdb1g,230
+mm_sol-0.2.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.2.7.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.2.7.dist-info/RECORD,,

mm_sol/types.py

@@ -1,4 +0,0 @@
-from collections.abc import Sequence
-
-type Proxies = str | Sequence[str] | None
-type Nodes = str | Sequence[str]

mm_sol-0.2.5.dist-info/RECORD

@@ -1,29 +0,0 @@
-mm_sol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_sol/account.py,sha256=WlcbPsRpseC507J3E_G-A2-PJGUToNqzSGjrg0pc-B8,3144
-mm_sol/balance.py,sha256=QzLjzW2fCGH9Uo8gjxerUnwCStsbkVrguXdPs5N6R5I,667
-mm_sol/block.py,sha256=4Lc4TANgpGvPflVumC9MR-3vIl1dedGyci3cgzczuds,1794
-mm_sol/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_sol/rpc.py,sha256=TspD_KZQp_KJDQzRknxaT8DR03okok26UWDQWF7Zflg,8031
-mm_sol/solana_cli.py,sha256=odXNPe8G7dvsGcZxujAFjkd0vWM6fdVvt_mzPulgDZQ,8292
-mm_sol/token.py,sha256=LpFnmTzbtKo_Z5hWX96k1Z153640N8VzXHCvsH5zArs,4903
-mm_sol/transfer.py,sha256=Bdh3amO-sO180Clq5RVgB9y7NXHhu1EbFNgEsGzHjFY,2911
-mm_sol/types.py,sha256=vXXP5Dc72BpHv5tsyws0KDZebG1W1-5HH0UjL7N2Mgc,113
-mm_sol/utils.py,sha256=tjV2d6ZZ-Z61cS0WWTPX2yZ2VoJUQv11CNW0p3nO54M,1016
-mm_sol/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_sol/cli/cli.py,sha256=l3AKhrgO6GEFrwh3gov9_cfjyFZY0VbZGc0o7NqUWrU,3078
-mm_sol/cli/cli_utils.py,sha256=bOrU1LFgndBv4hlNNviHQOob3NfiOsS5YWWDm6fzpCs,1032
-mm_sol/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_sol/cli/cmd/balance_cmd.py,sha256=IryMXq_8yGF9lDXO5kmUo6TRGgedl_9rS3bE1iRPTw0,2516
-mm_sol/cli/cmd/balances_cmd.py,sha256=x6PdXqZgkSmHAsbxim06T4_iPbihUIB4GLy0ZPy5t0s,2168
-mm_sol/cli/cmd/example_cmd.py,sha256=bK_z4du0UPGAoiHnYdi6iaZim_kKlYw4NKBbzvyes28,221
-mm_sol/cli/cmd/node_cmd.py,sha256=UKlZZzd8MVfQHqAjigJRwPj95Mwq2cpHfWgH8BVuwaw,242
-mm_sol/cli/cmd/transfer_sol_cmd.py,sha256=Ta3H4TXxlCCKgcedphN6PU90iYQiZvmYYuKPO044ciw,1196
-mm_sol/cli/cmd/wallet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_sol/cli/cmd/wallet/keypair_cmd.py,sha256=7Dk2eT6hfWRLI0uHO_rAQS8xRwY2S6Uk4iBEIO9aQ_w,561
-mm_sol/cli/cmd/wallet/new_cmd.py,sha256=nvFy5lkk8XUM5jchx0rn0aHHQ0LGVgbwpn7-kej9ccI,448
-mm_sol/cli/examples/balances.yml,sha256=SoFcf_IhgA2zrbihrVpqm-ikes80wLFGVzafrjO00UY,290
-mm_sol/cli/examples/transfer-sol.yml,sha256=fEf5lxnotLwQHt85JzwN0o6kax_Am88VKH5e-n1HP94,290
-mm_sol-0.2.5.dist-info/METADATA,sha256=CARYWN8yylvN_Py6sDi3DBhOcrMlXja6IPlK-LxoiF4,221
-mm_sol-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_sol-0.2.5.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
-mm_sol-0.2.5.dist-info/RECORD,,