mm-sol 0.4.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

mm_sol/cli/cli.py

@@ -64,6 +64,7 @@ def balances_command(
 def transfer_command(
     config_path: Path,
     print_balances: bool = typer.Option(False, "--balances", "-b", help="Print balances and exit"),
+    print_transfers: bool = typer.Option(False, "--transfers", "-t", help="Print transfers (from, to, value) and exit"),
     print_config: bool = typer.Option(False, "--config", "-c", help="Print config and exit"),
     config_verbose: bool = typer.Option(False, "--config-verbose", help="Print config in verbose mode and exit"),
     emulate: bool = typer.Option(False, "--emulate", "-e", help="Emulate transaction posting"),
@@ -74,6 +75,7 @@ def transfer_command(
         TransferCmdParams(
             config_path=config_path,
             print_balances=print_balances,
+            print_transfers=print_transfers,
             debug=debug,
             no_confirmation=no_confirmation,
             emulate=emulate,

mm_sol/cli/cli_utils.py

@@ -21,12 +21,10 @@ class BaseConfigParams(BaseModel):
     print_config_and_exit: bool
 
 
-def print_config(
-    config: BaseConfig, verbose: bool, exclude_fields: set[str] | None = None, count_fields: set[str] | None = None
-) -> None:
-    data = config.model_dump(exclude=exclude_fields)
-    if not verbose and count_fields:
-        for k in count_fields:
+def print_config(config: BaseConfig, exclude: set[str] | None = None, count: set[str] | None = None) -> None:
+    data = config.model_dump(exclude=exclude)
+    if count:
+        for k in count:
             data[k] = len(data[k])
     print_json(data)
 

mm_sol/cli/cmd/example_cmd.py

@@ -1,8 +1,8 @@
 from pathlib import Path
 
-from mm_std import print_plain
+from mm_std import pretty_print_toml
 
 
 def run(module: str) -> None:
     example_file = Path(Path(__file__).parent.absolute(), "../examples", f"{module}.toml")
-    print_plain(example_file.read_text())
+    pretty_print_toml(example_file.read_text())

mm_sol/cli/cmd/transfer_cmd.py

@@ -5,30 +5,31 @@ from typing import Annotated, Self
 
 import mm_crypto_utils
 from loguru import logger
-from mm_crypto_utils import AddressToPrivate, TxRoute
+from mm_crypto_utils import AddressToPrivate, Transfer
 from mm_std import BaseConfig, Err, fatal, utc_now
 from pydantic import AfterValidator, BeforeValidator, Field, model_validator
+from rich.console import Console
 from rich.live import Live
 from rich.table import Table
 from solders.signature import Signature
 
-from mm_sol import transfer
 from mm_sol.balance import get_sol_balance_with_retries, get_token_balance_with_retries
 from mm_sol.cli import calcs, cli_utils
 from mm_sol.cli.cli_utils import BaseConfigParams
 from mm_sol.cli.validators import Validators
 from mm_sol.converters import lamports_to_sol, to_token
 from mm_sol.token import get_decimals_with_retries
+from mm_sol.transfer import transfer_sol_with_retries, transfer_token_with_retries
 
 
 class Config(BaseConfig):
     nodes: Annotated[list[str], BeforeValidator(Validators.nodes())]
-    routes: Annotated[list[TxRoute], BeforeValidator(Validators.sol_routes())]
+    transfers: Annotated[list[Transfer], BeforeValidator(Validators.sol_transfers())]
     private_keys: Annotated[AddressToPrivate, BeforeValidator(Validators.sol_private_keys())]
     proxies: Annotated[list[str], Field(default_factory=list), BeforeValidator(Validators.proxies())]
     token: Annotated[str | None, AfterValidator(Validators.sol_address())] = None
     token_decimals: int = -1
-    value: Annotated[str, AfterValidator(Validators.valid_sol_or_token_expression("balance"))]
+    default_value: Annotated[str | None, AfterValidator(Validators.valid_sol_or_token_expression("balance"))] = None
     value_min_limit: Annotated[str | None, AfterValidator(Validators.valid_sol_or_token_expression())] = None
     delay: Annotated[str | None, AfterValidator(Validators.valid_calc_decimal_value())] = None  # in seconds
     round_ndigits: int = 5
@@ -37,19 +38,28 @@ class Config(BaseConfig):
 
     @property
     def from_addresses(self) -> list[str]:
-        return [r.from_address for r in self.routes]
+        return [r.from_address for r in self.transfers]
 
     @model_validator(mode="after")
     def final_validator(self) -> Self:
         if not self.private_keys.contains_all_addresses(self.from_addresses):
             raise ValueError("private keys are not set for all addresses")
 
+        for transfer in self.transfers:  # If value is not set for a transfer, then set it to the global value of the config.
+            if not transfer.value and self.default_value:
+                transfer.value = self.default_value
+        for transfer in self.transfers:  # Check all transfers have a value.
+            if not transfer.value:
+                raise ValueError(f"{transfer.log_prefix}: value is not set")
+
         if self.token:
-            Validators.valid_token_expression("balance")(self.value)
+            if self.default_value:
+                Validators.valid_token_expression("balance")(self.default_value)
             if self.value_min_limit:
                 Validators.valid_token_expression()(self.value_min_limit)
         else:
-            Validators.valid_sol_expression("balance")(self.value)
+            if self.default_value:
+                Validators.valid_sol_expression("balance")(self.default_value)
             if self.value_min_limit:
                 Validators.valid_sol_expression()(self.value_min_limit)
 
@@ -64,6 +74,7 @@ class Config(BaseConfig):
 
 class TransferCmdParams(BaseConfigParams):
     print_balances: bool
+    print_transfers: bool
     debug: bool
     no_confirmation: bool
     emulate: bool
@@ -74,10 +85,12 @@ def run(cmd_params: TransferCmdParams) -> None:
     config = Config.read_toml_config_or_exit(cmd_params.config_path)
 
     if cmd_params.print_config_and_exit:
-        cli_utils.print_config(config, cmd_params.print_config_verbose, {"private_keys"}, {"proxies"})
+        cli_utils.print_config(config, exclude={"private_keys"}, count=None if cmd_params.debug else {"proxies"})
         sys.exit(0)
 
-    mm_crypto_utils.init_logger(cmd_params.debug, config.log_debug, config.log_info)
+    if cmd_params.print_transfers:
+        _print_transfers(config)
+        sys.exit(0)
 
     if cmd_params.print_balances:
         _print_balances(config)
@@ -87,23 +100,25 @@ def run(cmd_params: TransferCmdParams) -> None:
 
 
 def _run_transfers(config: Config, cmd_params: TransferCmdParams) -> None:
+    mm_crypto_utils.init_logger(cmd_params.debug, config.log_debug, config.log_info)
     logger.info(f"transfer {cmd_params.config_path}: 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):
+    for i, route in enumerate(config.transfers):
         _transfer(route, config, cmd_params)
-        if not cmd_params.emulate and config.delay is not None and i < len(config.routes) - 1:
+        if config.delay is not None and i < len(config.transfers) - 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"delay {delay_value} seconds")
+            if not cmd_params.emulate:
+                time.sleep(float(delay_value))
     logger.info(f"transfer {cmd_params.config_path}: finished at {utc_now()} UTC")
 
 
-def _calc_value(route: TxRoute, config: Config, transfer_sol_fee: int) -> int | None:
+def _calc_value(transfer: Transfer, config: Config, transfer_sol_fee: int) -> int | None:
     if config.token:
         value_res = calcs.calc_token_value_for_address(
             nodes=config.nodes,
-            value_expression=config.value,
-            wallet_address=route.from_address,
+            value_expression=transfer.value,
+            wallet_address=transfer.from_address,
             proxies=config.proxies,
             token_mint_address=config.token,
             token_decimals=config.token_decimals,
@@ -111,19 +126,19 @@ def _calc_value(route: TxRoute, config: Config, transfer_sol_fee: int) -> int |
     else:
         value_res = calcs.calc_sol_value_for_address(
             nodes=config.nodes,
-            value_expression=config.value,
-            address=route.from_address,
+            value_expression=transfer.value,
+            address=transfer.from_address,
             proxies=config.proxies,
             fee=transfer_sol_fee,
         )
-    logger.debug(f"{route.log_prefix}: value={value_res.ok_or_err()}")
+    logger.debug(f"{transfer.log_prefix}: value={value_res.ok_or_err()}")
     if isinstance(value_res, Err):
-        logger.info(f"{route.log_prefix}: calc value error, {value_res.err}")
+        logger.info(f"{transfer.log_prefix}: calc value error, {value_res.err}")
 
     return value_res.ok
 
 
-def _check_value_min_limit(route: TxRoute, value: int, config: Config) -> bool:
+def _check_value_min_limit(transfer: Transfer, value: int, config: Config) -> bool:
     """Returns False if the transfer should be skipped."""
     if config.value_min_limit:
         if config.token:
@@ -131,7 +146,7 @@ def _check_value_min_limit(route: TxRoute, value: int, config: Config) -> bool:
         else:
             value_min_limit = calcs.calc_sol_expression(config.value_min_limit)
         if value < value_min_limit:
-            logger.info(f"{route.log_prefix}: value<value_min_limit, value={_value_with_suffix(value, config)}")
+            logger.info(f"{transfer.log_prefix}: value<value_min_limit, value={_value_with_suffix(value, config)}")
     return True
 
 
@@ -141,62 +156,70 @@ def _value_with_suffix(value: int, config: Config) -> str:
     return f"{lamports_to_sol(value, config.round_ndigits)}sol"
 
 
-def _send_tx(route: TxRoute, value: int, config: Config) -> Signature | None:
-    logger.debug(f"{route.log_prefix}: value={_value_with_suffix(value, config)}")
+def _send_tx(transfer: Transfer, value: int, config: Config) -> Signature | None:
+    logger.debug(f"{transfer.log_prefix}: value={_value_with_suffix(value, config)}")
     if config.token:
-        res = transfer.transfer_token_with_retries(
+        res = transfer_token_with_retries(
             nodes=config.nodes,
             token_mint_address=config.token,
-            from_address=route.from_address,
-            private_key=config.private_keys[route.from_address],
-            to_address=route.to_address,
+            from_address=transfer.from_address,
+            private_key=config.private_keys[transfer.from_address],
+            to_address=transfer.to_address,
             amount=value,
             decimals=config.token_decimals,
             proxies=config.proxies,
             retries=3,
         )
     else:
-        res = transfer.transfer_sol_with_retries(
+        res = transfer_sol_with_retries(
             nodes=config.nodes,
-            from_address=route.from_address,
-            private_key=config.private_keys[route.from_address],
-            to_address=route.to_address,
+            from_address=transfer.from_address,
+            private_key=config.private_keys[transfer.from_address],
+            to_address=transfer.to_address,
             lamports=value,
             proxies=config.proxies,
             retries=3,
         )
 
     if isinstance(res, Err):
-        logger.info(f"{route.log_prefix}: tx error {res.err}")
+        logger.info(f"{transfer.log_prefix}: tx error {res.err}")
         return None
     return res.ok
 
 
-def _transfer(route: TxRoute, config: Config, cmd_params: TransferCmdParams) -> None:
+def _transfer(transfer: Transfer, config: Config, cmd_params: TransferCmdParams) -> None:
     transfer_sol_fee = 5000
 
-    value = _calc_value(route, config, transfer_sol_fee)
+    value = _calc_value(transfer, config, transfer_sol_fee)
     if value is None:
         return
 
-    if not _check_value_min_limit(route, value, config):
+    if not _check_value_min_limit(transfer, value, config):
         return
 
     if cmd_params.emulate:
-        logger.info(f"{route.log_prefix}: emulate, value={_value_with_suffix(value, config)}")
+        logger.info(f"{transfer.log_prefix}: emulate, value={_value_with_suffix(value, config)}")
         return
 
-    signature = _send_tx(route, value, config)
+    signature = _send_tx(transfer, value, config)
     if signature is None:
         return
 
     status = "UNKNOWN"
     if not cmd_params.no_confirmation:
-        logger.debug(f"{route.log_prefix}: waiting for confirmation, sig={signature}")
-        if cli_utils.wait_confirmation(config.nodes, config.proxies, signature, route.log_prefix):
+        logger.debug(f"{transfer.log_prefix}: waiting for confirmation, sig={signature}")
+        if cli_utils.wait_confirmation(config.nodes, config.proxies, signature, transfer.log_prefix):
             status = "OK"
 
-    logger.info(f"{route.log_prefix}: sig={signature}, value={_value_with_suffix(value, config)}, status={status}")
+    logger.info(f"{transfer.log_prefix}: sig={signature}, value={_value_with_suffix(value, config)}, status={status}")
+
+
+def _print_transfers(config: Config) -> None:
+    table = Table("n", "from_address", "to_address", "value", title="transfers")
+    for count, transfer in enumerate(config.transfers, start=1):
+        table.add_row(str(count), transfer.from_address, transfer.to_address, transfer.value)
+    console = Console()
+    console.print(table)
 
 
 def _print_balances(config: Config) -> None:
@@ -206,7 +229,7 @@ def _print_balances(config: Config) -> None:
         headers = ["n", "from_address", "sol", "to_address", "sol"]
     table = Table(*headers, title="balances")
     with Live(table, refresh_per_second=0.5):
-        for count, route in enumerate(config.routes):
+        for count, route in enumerate(config.transfers):
             from_sol_balance = _get_sol_balance_str(route.from_address, config)
             to_sol_balance = _get_sol_balance_str(route.to_address, config)
             from_t_balance = _get_token_balance_str(route.from_address, config) if config.token else ""

mm_sol/cli/examples/balances.toml

@@ -2,9 +2,11 @@ accounts = """
 9WzDXwBbmkg8ZTbNMqUxvQRAyrZzDsGYdLVL9zYtAWWM # binance
 61aq585V8cR2sZBeawJFt2NPqmN7zDi1sws4KLs5xHXV # Jupiter cold wallet
 """
+
 tokens = """
 EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v # USDC
 JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN # JUP
 """
+
 nodes = "https://api.mainnet-beta.solana.com"
 # proxies = "env_url: MM_SOL_PROXIES_URL"

mm_sol/cli/examples/transfer.toml

@@ -1,22 +1,34 @@
-routes = """
-Bd8CxCTLez2ckVTqEJjuZkWjYFSRbo8fA1qYbd7yFVP9 Eaft9xXzfgbRqsHd65WspoaxTtH7pkznM9YA8tsDKGwj # comments are allowed
-Fc2TRJVCpFZpRz56mFnQETctib1zwFnwHcS7HoQSgUzZ EVJctTWikt29rUXBf49tyQdK87x837HtvpCwqeSjp1Ur
-file: /from/addresses.txt /to/addresses.txt
+# Each line is a transfer instruction, with format: from_address to_address [value]
+# Value is optional. If value is not set, default_value will be used
+# value is an expression that can contain variable 'balance' and 'random' function
+transfers = """
+# for sol transfer use 'sol' suffix, example: 1.2sol. For other tokens use 't' suffix, example: 1.2t
+Bd8CxCTLez2ckVTqEJjuZkWjYFSRbo8fA1qYbd7yFVP9 Eaft9xXzfgbRqsHd65WspoaxTtH7pkznM9YA8tsDKGwj 1.2t 
+Fc2TRJVCpFZpRz56mFnQETctib1zwFnwHcS7HoQSgUzZ EVJctTWikt29rUXBf49tyQdK87x837HtvpCwqeSjp1Ur 0.6balance-random(1t,2.50t)-100
+6TW4WswDgGmEB5HELBtEdwC1tQJq9Xa1msDjPw94sgai GGb7gb5EzW8GZZWX552eiC9r1SY4Pqtgbqf9UMrBrEzy # default_value will be used
+file: /path/to/other/transfers.txt # transfers from this file will be added
 """
+
 token = "6VBTMLgv256c7scudNf8T5GoTJcEE8WfgcJhxbGYPQ8G" # if token is not specified, then SOL is used
+
 private_keys = """
 5VTfgpKKkckrsK33vcw6cEgv8SjLiwaorU8sd2ftjo2sx4tCV6N44dF4P9VigLaKNT2vpX3VuiFAiNpEBnMq3CiB
 DE9poAKvs6tENFbADZ25W1zfKeiCbuDnFbafkBgo4rT28ZGkemqnF1zAqX9WGvBKUXSRVhXgX1RHe3qn11xfjR8
 file: ./path/to/privates.txt
 # Extra keys are not a problem, nor is their order.
 """
-value = "0.2balance + random(1t, 2.50t) - 100" # If transferring SOL, the suffix ‘sol’ is used. For any other tokens, the suffix ‘t’ is used.
+
+# default_value is used if transfer.value is not set in transfers. It's optional.
+default_value = "0.2balance+random(1t,2.50t)-100" # If transferring SOL, the suffix ‘sol’ is used. For any other tokens, the suffix ‘t’ is used.
+
 delay = "random(10, 100)" # seconds, optional
+
 proxies = """
 http://usr:pass@123.123.123.123:1234
 env_url: MM_SOL_PROXIES_URL
 url: https://site.com/api/proxies
 """
+
 nodes = """
 https://api.devnet.solana.com
 http://localhost:8899

mm_sol/cli/validators.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable
 
-from mm_crypto_utils import AddressToPrivate, ConfigValidators, TxRoute
+from mm_crypto_utils import AddressToPrivate, ConfigValidators, Transfer
 
 from mm_sol.account import get_public_key, is_address
 from mm_sol.constants import SUFFIX_DECIMALS
@@ -16,8 +16,8 @@ class Validators(ConfigValidators):
         return ConfigValidators.addresses(unique, is_address=is_address)
 
     @staticmethod
-    def sol_routes() -> Callable[[str], list[TxRoute]]:
-        return ConfigValidators.routes(is_address)
+    def sol_transfers() -> Callable[[str], list[Transfer]]:
+        return ConfigValidators.transfers(is_address)
 
     @staticmethod
     def sol_private_keys() -> Callable[[str], AddressToPrivate]:

{mm_sol-0.4.0.dist-info → mm_sol-0.5.1.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.4.0
+Version: 0.5.1
 Requires-Python: >=3.12
 Requires-Dist: base58~=2.1.1
+Requires-Dist: cryptography>=44.0.1
 Requires-Dist: jinja2>=3.1.5
-Requires-Dist: mm-crypto-utils>=0.1.5
+Requires-Dist: mm-crypto-utils>=0.2.4
 Requires-Dist: mnemonic==0.21
-Requires-Dist: solana~=0.36.3
+Requires-Dist: solana~=0.36.5
 Requires-Dist: typer>=0.15.1

{mm_sol-0.4.0.dist-info → mm_sol-0.5.1.dist-info}/RECORD

@@ -12,21 +12,21 @@ mm_sol/transfer.py,sha256=taf2NTLpo-bxISeaILARXEGLldUvqvP-agp5IDva7Hw,5825
 mm_sol/utils.py,sha256=NE0G564GiT9d7rW_lPPxUb1eq62WiXh28xtvtzNQIqw,556
 mm_sol/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/cli/calcs.py,sha256=-r9RlsQyOziTDf84uIsvTgZmsUdNrVeazu3vTj9hhNA,1887
-mm_sol/cli/cli.py,sha256=_6Fv3_RC20Yllee3NUXBO_DUfdaAD0vvL_jW_YVcrFo,4444
-mm_sol/cli/cli_utils.py,sha256=rYcunR8w3uyFX44zs8GT4vNZbkrcMtQWgjRi7gkBCos,1912
-mm_sol/cli/validators.py,sha256=q9Na86x4w21CX4_1DawKDHd8JF7HHtkAOZdsaDo9_zk,1371
+mm_sol/cli/cli.py,sha256=a28Cy1X2bRSIAAJu2HHoPoTJYOPvff-anVcL0BJnwRI,4610
+mm_sol/cli/cli_utils.py,sha256=nFdY8tJFZxyssEBEFCc3VTNJt447e6vMnugx4GBPL4o,1840
+mm_sol/cli/validators.py,sha256=M_Rr7JoG3TUYTDAGkjQLDH6l9i9FOrSpss30KdY3UlM,1379
 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=gMRZXAnCOPESsKRqz33ALPzSOqGGeZF225kMRO6sV-c,2876
-mm_sol/cli/cmd/example_cmd.py,sha256=M5dvRg9jvpVUwxvMRiRnO77aKR7c57bMY9booxMAswM,222
+mm_sol/cli/cmd/example_cmd.py,sha256=ZLTy1-cmapiCyYvjFInVE-pQCGKZzDgYKUhsOwtbSIY,234
 mm_sol/cli/cmd/node_cmd.py,sha256=2AEAjq2M9f8-RZiI0rif6wITdns9QUb4Kr34QPsI2CA,238
-mm_sol/cli/cmd/transfer_cmd.py,sha256=7LEQ2e-aTeawwTXkNwtsB044zHFsNEHXj3cCbp5rb-Q,9832
+mm_sol/cli/cmd/transfer_cmd.py,sha256=eQzD7LispR4KFMUlXdXMBGbXs7b0A-iHJHs7VkxH1UA,11021
 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=jyfUXusAWe6suuuwnPIfqWdU2kfT3hfMjkZ6uYMg8s0,347
-mm_sol/cli/examples/transfer.toml,sha256=C8cHd0BMmD4KPqU4OWLrV8Deu7VVEOJ71H2YZxHhuLg,1027
-mm_sol-0.4.0.dist-info/METADATA,sha256=t249_PGnuxYLN2_2GSoIrIQHSp-whVl_SMarQtufQ9Y,259
-mm_sol-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_sol-0.4.0.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
-mm_sol-0.4.0.dist-info/RECORD,,
+mm_sol/cli/examples/balances.toml,sha256=333g2EkyYBDW7OWFGMIWVZGkdFQMMo0Ag-bg-BvS4Zg,349
+mm_sol/cli/examples/transfer.toml,sha256=kOCdmuwmhlOam4LVtlcYTKF0PoZYHWMlv9gWxNSXMOk,1624
+mm_sol-0.5.1.dist-info/METADATA,sha256=9c53i7Z36GysrsTO3bWiwNKbRAAW0NkvvACbwabvJHM,295
+mm_sol-0.5.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.5.1.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.5.1.dist-info/RECORD,,