mm-sol 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

mm_sol/account.py

@@ -1,3 +1,4 @@
+import contextlib
 import random
 
 import base58
@@ -84,9 +85,8 @@ def is_empty_account(*, address: str, node: str | None = None, nodes: list[str]
     return Err(error or "unknown response", data=data)
 
 
-def is_valid_pubkey(pubkey: str) -> bool:
-    try:
+def is_address(pubkey: str) -> bool:
+    with contextlib.suppress(Exception):
         Pubkey.from_string(pubkey)
-        return True  # noqa: TRY300
-    except Exception:
-        return False
+        return True
+    return False

mm_sol/cli/calcs.py

@@ -4,10 +4,10 @@ from decimal import Decimal
 import mm_crypto_utils
 from loguru import logger
 from mm_crypto_utils import Nodes, Proxies
-from mm_std import Err
+from mm_std import Ok, Result
 from mm_std.str import split_on_plus_minus_tokens
 
-from mm_sol.balance import get_sol_balance_with_retries
+from mm_sol.balance import get_sol_balance_with_retries, get_token_balance_with_retries
 from mm_sol.converters import lamports_to_sol, sol_to_lamports, to_lamports
 
 
@@ -69,25 +69,33 @@ def is_sol_value_less_min_limit(value_min_limit: str | None, value: int, log_pre
     return False
 
 
-def calc_sol_value(
-    *,
-    nodes: Nodes,
-    value_str: str,
-    address: str,
-    proxies: Proxies,
-    fee: int = 5000,
-    log_prefix: str | None = None,
-) -> int | None:
+def calc_sol_value(*, nodes: Nodes, value_str: str, address: str, proxies: Proxies, fee: int = 5000) -> Result[int]:
     balance_value = None
     if "balance" in value_str.lower():
-        prefix = mm_crypto_utils.get_log_prefix(log_prefix)
         res = get_sol_balance_with_retries(nodes, address, proxies=proxies, retries=5)
-        logger.debug(f"{prefix}balance={res.ok_or_err()}")
-        if isinstance(res, Err):
-            logger.info(f"{prefix}balance error, {res.err}")
-            return None
+        if res.is_err():
+            return res
         balance_value = res.ok
     value = calc_var_value(value_str, var_name="balance", var_value=balance_value)
     if "balance" in value_str.lower():
         value = value - fee
-    return value
+    return Ok(value)
+
+
+def calc_token_value(
+    *, nodes: Nodes, value_str: str, wallet_address: str, token_mint_address: str, token_decimals: int, proxies: Proxies
+) -> Result[int]:
+    balance_value = None
+    if "balance" in value_str.lower():
+        res = get_token_balance_with_retries(
+            nodes=nodes,
+            owner_address=wallet_address,
+            token_mint_address=token_mint_address,
+            proxies=proxies,
+            retries=5,
+        )
+        if res.is_err():
+            return res
+        balance_value = res.ok
+    value = calc_var_value(value_str, var_name="balance", var_value=balance_value, decimals=token_decimals)
+    return Ok(value)

mm_sol/cli/cli.py

@@ -5,7 +5,7 @@ import typer
 from mm_std import print_plain
 
 from . import cli_utils
-from .cmd import balance_cmd, balances_cmd, example_cmd, node_cmd, transfer_sol_cmd
+from .cmd import balance_cmd, balances_cmd, example_cmd, node_cmd, transfer_sol_cmd, transfer_token_cmd
 from .cmd.wallet import keypair_cmd, new_cmd
 
 app = typer.Typer(no_args_is_help=True, pretty_exceptions_enable=False, add_completion=False)
@@ -73,6 +73,25 @@ def transfer_sol_command(
     )
 
 
+@app.command(name="transfer-token", help="Transfer token from one or many accounts")
+def transfer_token_command(
+    config_path: str,
+    print_balances: bool = typer.Option(False, "--balances", "-b", help="Print balances and exit"),
+    print_config: bool = typer.Option(False, "--config", "-c", help="Print config and exit"),
+    emulate: bool = typer.Option(False, "--emulate", "-e", help="Emulate transaction posting"),
+    no_confirmation: bool = typer.Option(False, "--no-confirmation", "-nc", help="Do not wait for confirmation"),
+    debug: bool = typer.Option(False, "--debug", "-d", help="Print debug info"),
+) -> None:
+    transfer_token_cmd.run(
+        config_path,
+        print_balances=print_balances,
+        print_config=print_config,
+        debug=debug,
+        no_confirmation=no_confirmation,
+        emulate=emulate,
+    )
+
+
 @app.command(name="node", help="Check RPC urls")
 def node_command(
     urls: Annotated[list[str], typer.Argument()],

mm_sol/cli/cmd/balances_cmd.py

@@ -10,14 +10,14 @@ from pydantic import BeforeValidator, Field, model_validator
 
 import mm_sol.converters
 from mm_sol import balance
-from mm_sol.account import is_valid_pubkey
+from mm_sol.account import is_address
 from mm_sol.balance import get_token_balance_with_retries
 
 
 class Config(BaseConfig):
-    accounts: Annotated[list[str], BeforeValidator(ConfigValidators.addresses(unique=True, is_address=is_valid_pubkey))]
+    accounts: Annotated[list[str], BeforeValidator(ConfigValidators.addresses(unique=True, is_address=is_address))]
     nodes: Annotated[list[str], BeforeValidator(ConfigValidators.nodes())]
-    tokens: Annotated[list[str], BeforeValidator(ConfigValidators.addresses(unique=True, is_address=is_valid_pubkey))]
+    tokens: Annotated[list[str], BeforeValidator(ConfigValidators.addresses(unique=True, is_address=is_address))]
     proxies_url: str | None = None
     proxies: list[str] = Field(default_factory=list)
 

mm_sol/cli/cmd/transfer_sol_cmd.py

@@ -6,25 +6,26 @@ from typing import Annotated, Self
 
 import mm_crypto_utils
 from loguru import logger
-from mm_crypto_utils import AddressToPrivate, ConfigValidators, TxRoute
+from mm_crypto_utils import AddressToPrivate, TxRoute
 from mm_std import BaseConfig, Err, utc_now
 from pydantic import BeforeValidator, Field, model_validator
 from solders.signature import Signature
 
 from mm_sol import transfer
-from mm_sol.account import get_public_key, is_valid_pubkey
+from mm_sol.account import get_public_key, is_address
 from mm_sol.cli import calcs, cli_utils, validators
+from mm_sol.cli.validators import Validators
 from mm_sol.converters import lamports_to_sol
 from mm_sol.utils import get_client
 
 
 class Config(BaseConfig):
-    nodes: Annotated[list[str], BeforeValidator(ConfigValidators.nodes())]
-    routes: Annotated[list[TxRoute], BeforeValidator(ConfigValidators.routes(is_valid_pubkey))]
+    nodes: Annotated[list[str], BeforeValidator(Validators.nodes())]
+    routes: Annotated[list[TxRoute], BeforeValidator(Validators.routes(is_address))]
     routes_from_file: Path | None = None
     routes_to_file: Path | None = None
     private_keys: Annotated[
-        AddressToPrivate, Field(default_factory=AddressToPrivate), BeforeValidator(ConfigValidators.private_keys(get_public_key))
+        AddressToPrivate, Field(default_factory=AddressToPrivate), BeforeValidator(Validators.private_keys(get_public_key))
     ]
     private_keys_file: Path | None = None
     proxies_url: str | None = None
@@ -33,8 +34,8 @@ class Config(BaseConfig):
     value_min_limit: str | None = None
     delay: str | None = None  # in seconds
     round_ndigits: int = 5
-    log_debug: Annotated[Path | None, BeforeValidator(ConfigValidators.log_file())] = None
-    log_info: Annotated[Path | None, BeforeValidator(ConfigValidators.log_file())] = None
+    log_debug: Annotated[Path | None, BeforeValidator(Validators.log_file())] = None
+    log_info: Annotated[Path | None, BeforeValidator(Validators.log_file())] = None
 
     @property
     def from_addresses(self) -> list[str]:
@@ -44,7 +45,7 @@ class Config(BaseConfig):
     def final_validator(self) -> Self:
         # routes_files
         if self.routes_from_file and self.routes_to_file:
-            self.routes += TxRoute.from_files(self.routes_from_file, self.routes_to_file, is_valid_pubkey)
+            self.routes += TxRoute.from_files(self.routes_from_file, self.routes_to_file, is_address)
         if not self.routes:
             raise ValueError("routes is empty")
 
@@ -101,9 +102,7 @@ def run(
 
 def _run_transfers(config: Config, *, no_confirmation: bool, emulate: bool) -> None:
     logger.info(f"started at {utc_now()} UTC")
-    logger.debug(
-        f"config={config.model_dump(exclude={'private_keys', 'addresses_map', 'proxies'}) | {'version': cli_utils.get_version()}}"
-    )
+    logger.debug(f"config={config.model_dump(exclude={'private_keys'}) | {'version': cli_utils.get_version()}}")
     for i, route in enumerate(config.routes):
         _transfer(
             from_address=route.from_address,
@@ -123,11 +122,14 @@ def _transfer(*, from_address: str, to_address: str, config: Config, no_confirma
     log_prefix = f"{from_address}->{to_address}"
     fee = 5000
     # get value
-    value = calcs.calc_sol_value(
-        nodes=config.nodes, value_str=config.value, address=from_address, proxies=config.proxies, log_prefix=log_prefix, fee=fee
+    value_res = calcs.calc_sol_value(
+        nodes=config.nodes, value_str=config.value, address=from_address, proxies=config.proxies, fee=fee
     )
-    if value is None:
+    logger.debug(f"{log_prefix}value={value_res.ok_or_err()}")
+    if isinstance(value_res, Err):
+        logger.info(f"{log_prefix}calc value error, {value_res.err}")
         return
+    value = value_res.ok
 
     # value_min_limit
     if calcs.is_sol_value_less_min_limit(config.value_min_limit, value, log_prefix=log_prefix):

mm_sol/cli/cmd/transfer_token_cmd.py

@@ -0,0 +1,135 @@
+import os
+import sys
+import time
+from pathlib import Path
+from typing import Annotated, Self
+
+import mm_crypto_utils
+import typer
+from loguru import logger
+from mm_crypto_utils import AddressToPrivate, TxRoute
+from mm_std import BaseConfig, Err, fatal, utc_now
+from pydantic import AfterValidator, BeforeValidator, Field, model_validator
+
+from mm_sol.account import get_public_key, is_address
+from mm_sol.cli import calcs, cli_utils
+from mm_sol.cli.validators import Validators
+from mm_sol.token import get_decimals_with_retries
+
+
+class Config(BaseConfig):
+    nodes: Annotated[list[str], BeforeValidator(Validators.nodes())]
+    routes: Annotated[list[TxRoute], BeforeValidator(Validators.routes(is_address))]
+    routes_from_file: Path | None = None
+    routes_to_file: Path | None = None
+    private_keys: Annotated[
+        AddressToPrivate, Field(default_factory=AddressToPrivate), BeforeValidator(Validators.private_keys(get_public_key))
+    ]
+    private_keys_file: Path | None = None
+    proxies_url: str | None = None
+    proxies: list[str] = Field(default_factory=list)
+    token: Annotated[str, AfterValidator(Validators.address(is_address))]
+    value: str
+    value_min_limit: str | None = None
+    delay: str | None = None  # in seconds
+    round_ndigits: int = 5
+    log_debug: Annotated[Path | None, BeforeValidator(Validators.log_file())] = None
+    log_info: Annotated[Path | None, BeforeValidator(Validators.log_file())] = None
+
+    @property
+    def from_addresses(self) -> list[str]:
+        return [r.from_address for r in self.routes]
+
+    @model_validator(mode="after")
+    def final_validator(self) -> Self:
+        # routes_files
+        if self.routes_from_file and self.routes_to_file:
+            self.routes += TxRoute.from_files(self.routes_from_file, self.routes_to_file, is_address)
+        if not self.routes:
+            raise ValueError("routes is empty")
+
+        # load private keys from file
+        if self.private_keys_file:
+            self.private_keys.update(AddressToPrivate.from_file(self.private_keys_file, get_public_key))
+
+        # check all private keys exist
+        if not self.private_keys.contains_all_addresses(self.from_addresses):
+            raise ValueError("private keys are not set for all addresses")
+
+        # fetch proxies from proxies_url
+        proxies_url = self.proxies_url or os.getenv("MM_PROXIES_URL", "")
+        if proxies_url:
+            self.proxies += mm_crypto_utils.fetch_proxies_or_fatal(proxies_url)
+
+        return self
+
+
+def run(
+    config_path: str,
+    *,
+    print_balances: bool,
+    print_config: bool,
+    debug: bool,
+    no_confirmation: bool,
+    emulate: bool,
+) -> None:
+    config = Config.read_config_or_exit(config_path)
+
+    if print_config:
+        config.print_and_exit({"private_keys", "proxies"})
+
+    mm_crypto_utils.init_logger(debug, config.log_debug, config.log_info)
+
+    decimals_res = get_decimals_with_retries(config.nodes, config.token, retries=3, proxies=config.proxies)
+    if isinstance(decimals_res, Err):
+        fatal(f"can't get decimals for token={config.token}, error={decimals_res.err}")
+
+    token_decimals = decimals_res.ok
+    logger.debug(f"token decimals={token_decimals}")
+
+    if print_balances:
+        # cli_utils.print_balances(config.nodes, config.from_addresses, round_ndigits=config.round_ndigits, proxies=config.proxies) # noqa: E501
+        typer.echo("Not implemented yet")
+        sys.exit(0)
+
+    _run_transfers(config, token_decimals, no_confirmation=no_confirmation, emulate=emulate)
+
+
+def _run_transfers(config: Config, token_decimals: int, *, no_confirmation: bool, emulate: bool) -> None:
+    logger.info(f"started at {utc_now()} UTC")
+    logger.debug(f"config={config.model_dump(exclude={'private_keys'}) | {'version': cli_utils.get_version()}}")
+    for i, route in enumerate(config.routes):
+        _transfer(
+            route=route,
+            token_decimals=token_decimals,
+            config=config,
+            no_confirmation=no_confirmation,
+            emulate=emulate,
+        )
+        if not emulate and config.delay is not None and i < len(config.routes) - 1:
+            delay_value = mm_crypto_utils.calc_decimal_value(config.delay)
+            logger.debug(f"delay {delay_value} seconds")
+            time.sleep(float(delay_value))
+    logger.info(f"finished at {utc_now()} UTC")
+
+
+def _transfer(*, route: TxRoute, config: Config, token_decimals: int, no_confirmation: bool, emulate: bool) -> None:
+    log_prefix = f"{route.from_address}->{route.to_address}"
+    fee = 5000
+
+    # get value
+    value_res = calcs.calc_token_value(
+        nodes=config.nodes,
+        value_str=config.value,
+        wallet_address=route.from_address,
+        proxies=config.proxies,
+        token_mint_address=config.token,
+        token_decimals=token_decimals,
+    )
+    logger.debug(f"{log_prefix}: value={value_res.ok_or_err()}")
+    if isinstance(value_res, Err):
+        logger.info(f"{log_prefix}: calc value error, {value_res.err}")
+        return
+    value = value_res.ok
+
+    logger.debug(f"{log_prefix}: value={value}, fee={fee}, no_confirmation={no_confirmation}, emulate={emulate}")

mm_sol/cli/validators.py

@@ -1,3 +1,5 @@
+from mm_crypto_utils import ConfigValidators
+
 from mm_sol.cli import calcs
 
 
@@ -9,3 +11,7 @@ def is_valid_var_lamports(value: str | None, base_name: str = "var", decimals: i
         return True  # noqa: TRY300
     except ValueError:
         return False
+
+
+class Validators(ConfigValidators):
+    pass

mm_sol/token.py

@@ -7,12 +7,14 @@ from mm_sol.utils import get_client
 
 
 def get_decimals(node: str, token_mint_address: str, timeout: float = 10, proxy: str | None = None) -> Result[int]:
+    data = None
     try:
         client = get_client(node, proxy=proxy, timeout=timeout)
         res = client.get_token_supply(Pubkey.from_string(token_mint_address))
+        data = res
         return Ok(res.value.decimals)
     except Exception as e:
-        return Err(e)
+        return Err(e, data=data)
 
 
 def get_decimals_with_retries(

{mm_sol-0.2.6.dist-info → mm_sol-0.2.8.dist-info}/METADATA

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

{mm_sol-0.2.6.dist-info → mm_sol-0.2.8.dist-info}/RECORD

@@ -1,31 +1,32 @@
 mm_sol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_sol/account.py,sha256=a0pt1tVdY1O2a4qmgfUd5nP-ftqv3ey0T-2ru5qtUWE,3222
+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=RpXHeM3KBH7q9SUyY_U2dRAgLPC7YgumOTAqxxf_JtI,1046
+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=1IQF1j6c9mRBH7UAnX-MwrCC4PJ3Vp1pg9haa2kG22I,3698
-mm_sol/cli/cli.py,sha256=9rWEDAd1iAwJYnC7voTo4ltqMtRd9IuHoGTmqwmDL8Q,3627
+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=RFbkSl67g6CXJJhgkNi0wvx_iXjXyQEqX5GmNYatshk,407
+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=rnsomOKu1_BsRGYvbjTSXVKQ1pqzv4F0fIAnHMjp9kk,2639
+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=vz2_yHmx0cFCD60ubgwru9seABJN71146vW8c-fPtew,6991
+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.6.dist-info/METADATA,sha256=UVHWer8SaDg55zgUGXeoXXORcQuuakRCfiFGQ9msbYY,230
-mm_sol-0.2.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_sol-0.2.6.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
-mm_sol-0.2.6.dist-info/RECORD,,
+mm_sol-0.2.8.dist-info/METADATA,sha256=ijsNaal8AmUCRafckp2F6XPP_D1Ejn9RU4pwdq839cA,230
+mm_sol-0.2.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.2.8.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.2.8.dist-info/RECORD,,