mm-sol 0.3.6__tar.gz → 0.5.0__tar.gz

{mm_sol-0.3.6 → mm_sol-0.5.0}/.gitignore

@@ -1,4 +1,5 @@
 .idea
+.vscode
 .venv
 .env
 .coverage

{mm_sol-0.3.6 → mm_sol-0.5.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.3.6
+Version: 0.5.0
 Requires-Python: >=3.12
 Requires-Dist: base58~=2.1.1
 Requires-Dist: jinja2>=3.1.5
-Requires-Dist: mm-crypto-utils>=0.1.4
+Requires-Dist: mm-crypto-utils>=0.2.3
 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.3.6 → mm_sol-0.5.0}/pyproject.toml

@@ -1,16 +1,15 @@
 [project]
 name = "mm-sol"
-version = "0.3.6"
+version = "0.5.0"
 description = ""
 requires-python = ">=3.12"
 dependencies = [
-    "mm-crypto-utils>=0.1.4",
-    "solana~=0.36.3",
+    "mm-crypto-utils>=0.2.3",
+    "solana~=0.36.5",
     "base58~=2.1.1",
     "mnemonic==0.21",
     "typer>=0.15.1",
     "jinja2>=3.1.5",
-
 ]
 [project.scripts]
 mm-sol = "mm_sol.cli.cli:app"
@@ -23,8 +22,8 @@ build-backend = "hatchling.build"
 dev-dependencies = [
     "pytest~=8.3.4",
     "pytest-xdist~=3.6.1",
-    "ruff~=0.9.4",
-    "pip-audit~=2.7.3",
+    "ruff~=0.9.6",
+    "pip-audit~=2.8.0",
     "bandit~=1.8.2",
     "mypy~=1.15.0",
 ]

{mm_sol-0.3.6 → mm_sol-0.5.0}/src/mm_sol/cli/cli.py

@@ -8,12 +8,15 @@ from mm_std import print_plain
 from mm_sol.account import PHANTOM_DERIVATION_PATH
 
 from . import cli_utils
-from .cmd import balance_cmd, balances_cmd, example_cmd, node_cmd, transfer_sol_cmd, transfer_token_cmd
+from .cmd import balance_cmd, balances_cmd, example_cmd, node_cmd, transfer_cmd
+from .cmd.transfer_cmd import TransferCmdParams
 from .cmd.wallet import keypair_cmd, mnemonic_cmd
 
 app = typer.Typer(no_args_is_help=True, pretty_exceptions_enable=False, add_completion=False)
 
-wallet_app = typer.Typer(no_args_is_help=True, help="Wallet commands: generate new accounts, private to address")
+wallet_app = typer.Typer(
+    no_args_is_help=True, help="Wallet-related commands: generate new accounts, derive addresses from private keys, and more"
+)
 app.add_typer(wallet_app, name="wallet")
 app.add_typer(wallet_app, name="w", hidden=True)
 
@@ -31,11 +34,10 @@ def main(_version: bool = typer.Option(None, "--version", callback=version_callb
 
 class ConfigExample(str, Enum):
     balances = "balances"
-    transfer_sol = "transfer-sol"
-    transfer_token = "transfer-token"  # noqa: S105 # nosec
+    transfer = "transfer"
 
 
-@app.command(name="example", help="Print an example of config for a command")
+@app.command(name="example", help="Displays an example configuration for a command")
 def example_command(command: Annotated[ConfigExample, typer.Argument()]) -> None:
     example_cmd.run(command.value)
 
@@ -51,52 +53,39 @@ def balance_command(
     balance_cmd.run(rpc_url, wallet_address, token_address, lamport, proxies_url)
 
 
-@app.command(name="balances", help="Print SOL and token balances for accounts")
+@app.command(name="balances", help="Displays SOL and token balances for multiple accounts")
 def balances_command(
     config_path: Path, print_config: Annotated[bool, typer.Option("--config", "-c", help="Print config and exit")] = False
 ) -> None:
     balances_cmd.run(config_path, print_config)
 
 
-@app.command(name="transfer-sol", help="Transfer SOL from one or many accounts")
-def transfer_sol_command(
+@app.command(name="transfer", help="Transfers SOL or SPL tokens, supporting multiple routes, delays, and expression-based values")
+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"),
     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_sol_cmd.run(
-        config_path,
-        print_balances=print_balances,
-        print_config=print_config,
-        debug=debug,
-        no_confirmation=no_confirmation,
-        emulate=emulate,
+    transfer_cmd.run(
+        TransferCmdParams(
+            config_path=config_path,
+            print_balances=print_balances,
+            print_transfers=print_transfers,
+            debug=debug,
+            no_confirmation=no_confirmation,
+            emulate=emulate,
+            print_config_and_exit=print_config or config_verbose,
+            print_config_verbose=config_verbose,
+        )
     )
 
 
-@app.command(name="transfer-token", help="Transfer token from one or many accounts")
-def transfer_token_command(
-    config_path: Path,
-    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")
+@app.command(name="node", help="Checks RPC URLs for availability and status")
 def node_command(
     urls: Annotated[list[str], typer.Argument()],
     proxy: Annotated[str | None, typer.Option("--proxy", "-p", help="Proxy")] = None,

{mm_sol-0.3.6 → mm_sol-0.5.0}/src/mm_sol/cli/cli_utils.py

@@ -1,9 +1,12 @@
 import importlib.metadata
 import time
+from pathlib import Path
 
 import mm_crypto_utils
 from loguru import logger
 from mm_crypto_utils import Nodes, Proxies
+from mm_std import BaseConfig, print_json
+from pydantic import BaseModel
 from solders.signature import Signature
 
 from mm_sol.utils import get_client
@@ -13,6 +16,19 @@ def get_version() -> str:
     return importlib.metadata.version("mm-sol")
 
 
+class BaseConfigParams(BaseModel):
+    config_path: Path
+    print_config_and_exit: bool
+
+
+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)
+
+
 def public_rpc_url(url: str | None) -> str:
     if not url:
         return "https://api.mainnet-beta.solana.com"

mm_sol-0.5.0/src/mm_sol/cli/cmd/transfer_cmd.py

@@ -0,0 +1,271 @@
+import sys
+import time
+from pathlib import Path
+from typing import Annotated, Self
+
+import mm_crypto_utils
+from loguru import logger
+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.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())]
+    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
+    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
+    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.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:
+            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:
+            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)
+
+        if self.token:
+            res = get_decimals_with_retries(self.nodes, self.token, retries=3, proxies=self.proxies)
+            if isinstance(res, Err):
+                fatal(f"can't get decimals for token={self.token}, error={res.err}")
+            self.token_decimals = res.ok
+
+        return self
+
+
+class TransferCmdParams(BaseConfigParams):
+    print_balances: bool
+    print_transfers: bool
+    debug: bool
+    no_confirmation: bool
+    emulate: bool
+    print_config_verbose: bool
+
+
+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, exclude={"private_keys"}, count=None if cmd_params.debug else {"proxies"})
+        sys.exit(0)
+
+    if cmd_params.print_transfers:
+        _print_transfers(config)
+        sys.exit(0)
+
+    if cmd_params.print_balances:
+        _print_balances(config)
+        sys.exit(0)
+
+    _run_transfers(config, cmd_params)
+
+
+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.transfers):
+        _transfer(route, config, cmd_params)
+        if config.delay is not None and i < len(config.transfers) - 1:
+            delay_value = mm_crypto_utils.calc_decimal_value(config.delay)
+            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(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=transfer.value,
+            wallet_address=transfer.from_address,
+            proxies=config.proxies,
+            token_mint_address=config.token,
+            token_decimals=config.token_decimals,
+        )
+    else:
+        value_res = calcs.calc_sol_value_for_address(
+            nodes=config.nodes,
+            value_expression=transfer.value,
+            address=transfer.from_address,
+            proxies=config.proxies,
+            fee=transfer_sol_fee,
+        )
+    logger.debug(f"{transfer.log_prefix}: value={value_res.ok_or_err()}")
+    if isinstance(value_res, Err):
+        logger.info(f"{transfer.log_prefix}: calc value error, {value_res.err}")
+
+    return value_res.ok
+
+
+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:
+            value_min_limit = calcs.calc_token_expression(config.value_min_limit, config.token_decimals)
+        else:
+            value_min_limit = calcs.calc_sol_expression(config.value_min_limit)
+        if value < value_min_limit:
+            logger.info(f"{transfer.log_prefix}: value<value_min_limit, value={_value_with_suffix(value, config)}")
+    return True
+
+
+def _value_with_suffix(value: int, config: Config) -> str:
+    if config.token:
+        return f"{to_token(value, decimals=config.token_decimals, ndigits=config.round_ndigits)}t"
+    return f"{lamports_to_sol(value, config.round_ndigits)}sol"
+
+
+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_token_with_retries(
+            nodes=config.nodes,
+            token_mint_address=config.token,
+            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_sol_with_retries(
+            nodes=config.nodes,
+            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"{transfer.log_prefix}: tx error {res.err}")
+        return None
+    return res.ok
+
+
+def _transfer(transfer: Transfer, config: Config, cmd_params: TransferCmdParams) -> None:
+    transfer_sol_fee = 5000
+
+    value = _calc_value(transfer, config, transfer_sol_fee)
+    if value is None:
+        return
+
+    if not _check_value_min_limit(transfer, value, config):
+        return
+
+    if cmd_params.emulate:
+        logger.info(f"{transfer.log_prefix}: emulate, value={_value_with_suffix(value, config)}")
+        return
+
+    signature = _send_tx(transfer, value, config)
+    if signature is None:
+        return
+
+    status = "UNKNOWN"
+    if not cmd_params.no_confirmation:
+        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"{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:
+    if config.token:
+        headers = ["n", "from_address", "sol", "t", "to_address", "sol", "t"]
+    else:
+        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.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 ""
+            to_t_balance = _get_token_balance_str(route.to_address, config) if config.token else ""
+
+            if config.token:
+                table.add_row(
+                    str(count),
+                    route.from_address,
+                    from_sol_balance,
+                    from_t_balance,
+                    route.to_address,
+                    to_sol_balance,
+                    to_t_balance,
+                )
+            else:
+                table.add_row(
+                    str(count),
+                    route.from_address,
+                    from_sol_balance,
+                    route.to_address,
+                    to_sol_balance,
+                )
+
+
+def _get_sol_balance_str(address: str, config: Config) -> str:
+    return get_sol_balance_with_retries(config.nodes, address, proxies=config.proxies, retries=5).map_or_else(
+        lambda err: err,
+        lambda ok: str(lamports_to_sol(ok, config.round_ndigits)),
+    )
+
+
+def _get_token_balance_str(address: str, config: Config) -> str:
+    if not config.token:
+        raise ValueError("token is not set")
+    return get_token_balance_with_retries(config.nodes, address, config.token, proxies=config.proxies, retries=5).map_or_else(
+        lambda err: err,
+        lambda ok: str(to_token(ok, config.token_decimals, ndigits=config.round_ndigits)),
+    )

{mm_sol-0.3.6 → mm_sol-0.5.0}/src/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-0.5.0/src/mm_sol/cli/examples/transfer.toml

@@ -0,0 +1,35 @@
+# 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.
+"""
+
+# 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-0.3.6 → mm_sol-0.5.0}/src/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]:
@@ -30,3 +30,7 @@ class Validators(ConfigValidators):
     @staticmethod
     def valid_token_expression(var_name: str | None = None) -> Callable[[str], str]:
         return ConfigValidators.valid_calc_int_expression(var_name, {"t": 6})
+
+    @staticmethod
+    def valid_sol_or_token_expression(var_name: str | None = None) -> Callable[[str], str]:
+        return ConfigValidators.valid_calc_int_expression(var_name, SUFFIX_DECIMALS | {"t": 6})

{mm_sol-0.3.6 → mm_sol-0.5.0}/uv.lock

@@ -298,19 +298,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d5/34/e8b383f35b77c402d28563d2b8f83159319b509bc5f760b15d60b0abf165/hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c", size = 32611 },
 ]
 
-[[package]]
-name = "html5lib"
-version = "1.1"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "six" },
-    { name = "webencodings" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/ac/b6/b55c3f49042f1df3dcd422b7f224f939892ee94f22abcf503a9b7339eaf2/html5lib-1.1.tar.gz", hash = "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f", size = 272215 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/6c/dd/a834df6482147d48e225a49515aabc28974ad5a4ca3215c18a882565b028/html5lib-1.1-py2.py3-none-any.whl", hash = "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d", size = 112173 },
-]
-
 [[package]]
 name = "httpcore"
 version = "1.0.7"
@@ -481,19 +468,19 @@ wheels = [
 
 [[package]]
 name = "mm-crypto-utils"
-version = "0.1.4"
+version = "0.2.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "loguru" },
     { name = "mm-std" },
 ]
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/b8/29/fb0a382faadf0ba377747a551e9136c0ad7f64286163de5d0e1e64ae3456/mm_crypto_utils-0.1.4-py3-none-any.whl", hash = "sha256:3b2e011959fa70f3498ea27b0e741d5e3915be771ec1de63729d8bd97b4d0ff4", size = 7733 },
+    { url = "https://files.pythonhosted.org/packages/78/dd/3cb0ddc4ab14a78a0e828fd1f7ca97298be8eff67b53b6198853e2013976/mm_crypto_utils-0.2.3-py3-none-any.whl", hash = "sha256:33ca42ef22c847c6f92973d7c799460926ee5c5bd7c872d3c7d19f31377e8833", size = 8257 },
 ]
 
 [[package]]
 name = "mm-sol"
-version = "0.3.6"
+version = "0.5.0"
 source = { editable = "." }
 dependencies = [
     { name = "base58" },
@@ -518,9 +505,9 @@ dev = [
 requires-dist = [
     { name = "base58", specifier = "~=2.1.1" },
     { name = "jinja2", specifier = ">=3.1.5" },
-    { name = "mm-crypto-utils", specifier = ">=0.1.4" },
+    { name = "mm-crypto-utils", specifier = ">=0.2.3" },
     { name = "mnemonic", specifier = "==0.21" },
-    { name = "solana", specifier = "~=0.36.3" },
+    { name = "solana", specifier = "~=0.36.5" },
     { name = "typer", specifier = ">=0.15.1" },
 ]
 
@@ -528,10 +515,10 @@ requires-dist = [
 dev = [
     { name = "bandit", specifier = "~=1.8.2" },
     { name = "mypy", specifier = "~=1.15.0" },
-    { name = "pip-audit", specifier = "~=2.7.3" },
+    { name = "pip-audit", specifier = "~=2.8.0" },
     { name = "pytest", specifier = "~=8.3.4" },
     { name = "pytest-xdist", specifier = "~=3.6.1" },
-    { name = "ruff", specifier = "~=0.9.4" },
+    { name = "ruff", specifier = "~=0.9.6" },
 ]
 
 [[package]]
@@ -674,22 +661,22 @@ wheels = [
 
 [[package]]
 name = "pip-audit"
-version = "2.7.3"
+version = "2.8.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "cachecontrol", extra = ["filecache"] },
     { name = "cyclonedx-python-lib" },
-    { name = "html5lib" },
     { name = "packaging" },
     { name = "pip-api" },
     { name = "pip-requirements-parser" },
+    { name = "platformdirs" },
     { name = "requests" },
     { name = "rich" },
     { name = "toml" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/46/2f/d030d0d3a50b776f910dd87dc1d57dd4a27bfad176b85882f463632e4747/pip_audit-2.7.3.tar.gz", hash = "sha256:08891bbf179bffe478521f150818112bae998424f58bf9285c0078965aef38bc", size = 50365 }
+sdist = { url = "https://files.pythonhosted.org/packages/e8/c8/44ccea85bd2024f1ebe55eb6cdaf1f2183359176689eed3c0b01926c24ad/pip_audit-2.8.0.tar.gz", hash = "sha256:9816cbd94de6f618a8965c117433006b3d565a708dc05d5a7be47ab65b66fa05", size = 51073 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/4d/4a/c908ec8a527698a6539b431d70454e18aef04d4190ff48107ed4d3df99ff/pip_audit-2.7.3-py3-none-any.whl", hash = "sha256:46a11faee3323f76adf7987de8171daeb660e8f57d8088cc27fb1c1e5c7747b0", size = 56266 },
+    { url = "https://files.pythonhosted.org/packages/11/0c/be5c42643284b2cfc5d9d36b576b7465268a163bd7df481a3979a3d87a0b/pip_audit-2.8.0-py3-none-any.whl", hash = "sha256:200f50d56cb6fba3a9189c20d53250354f72f161d63b6ef77ae5de2b53044566", size = 57002 },
 ]
 
 [[package]]
@@ -705,6 +692,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/54/d0/d04f1d1e064ac901439699ee097f58688caadea42498ec9c4b4ad2ef84ab/pip_requirements_parser-32.0.1-py3-none-any.whl", hash = "sha256:4659bc2a667783e7a15d190f6fccf8b2486685b6dba4c19c3876314769c57526", size = 35648 },
 ]
 
+[[package]]
+name = "platformdirs"
+version = "4.3.6"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/13/fc/128cc9cb8f03208bdbf93d3aa862e16d376844a14f9a0ce5cf4507372de4/platformdirs-4.3.6.tar.gz", hash = "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907", size = 21302 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/3c/a6/bc1012356d8ece4d66dd75c4b9fc6c1f6650ddd5991e421177d9f8f671be/platformdirs-4.3.6-py3-none-any.whl", hash = "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb", size = 18439 },
+]
+
 [[package]]
 name = "pluggy"
 version = "1.5.0"
@@ -911,27 +907,27 @@ wheels = [
 
 [[package]]
 name = "ruff"
-version = "0.9.4"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/c0/17/529e78f49fc6f8076f50d985edd9a2cf011d1dbadb1cdeacc1d12afc1d26/ruff-0.9.4.tar.gz", hash = "sha256:6907ee3529244bb0ed066683e075f09285b38dd5b4039370df6ff06041ca19e7", size = 3599458 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/b6/f8/3fafb7804d82e0699a122101b5bee5f0d6e17c3a806dcbc527bb7d3f5b7a/ruff-0.9.4-py3-none-linux_armv6l.whl", hash = "sha256:64e73d25b954f71ff100bb70f39f1ee09e880728efb4250c632ceed4e4cdf706", size = 11668400 },
-    { url = "https://files.pythonhosted.org/packages/2e/a6/2efa772d335da48a70ab2c6bb41a096c8517ca43c086ea672d51079e3d1f/ruff-0.9.4-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:6ce6743ed64d9afab4fafeaea70d3631b4d4b28b592db21a5c2d1f0ef52934bf", size = 11628395 },
-    { url = "https://files.pythonhosted.org/packages/dc/d7/cd822437561082f1c9d7225cc0d0fbb4bad117ad7ac3c41cd5d7f0fa948c/ruff-0.9.4-py3-none-macosx_11_0_arm64.whl", hash = "sha256:54499fb08408e32b57360f6f9de7157a5fec24ad79cb3f42ef2c3f3f728dfe2b", size = 11090052 },
-    { url = "https://files.pythonhosted.org/packages/9e/67/3660d58e893d470abb9a13f679223368ff1684a4ef40f254a0157f51b448/ruff-0.9.4-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37c892540108314a6f01f105040b5106aeb829fa5fb0561d2dcaf71485021137", size = 11882221 },
-    { url = "https://files.pythonhosted.org/packages/79/d1/757559995c8ba5f14dfec4459ef2dd3fcea82ac43bc4e7c7bf47484180c0/ruff-0.9.4-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:de9edf2ce4b9ddf43fd93e20ef635a900e25f622f87ed6e3047a664d0e8f810e", size = 11424862 },
-    { url = "https://files.pythonhosted.org/packages/c0/96/7915a7c6877bb734caa6a2af424045baf6419f685632469643dbd8eb2958/ruff-0.9.4-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:87c90c32357c74f11deb7fbb065126d91771b207bf9bfaaee01277ca59b574ec", size = 12626735 },
-    { url = "https://files.pythonhosted.org/packages/0e/cc/dadb9b35473d7cb17c7ffe4737b4377aeec519a446ee8514123ff4a26091/ruff-0.9.4-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:56acd6c694da3695a7461cc55775f3a409c3815ac467279dfa126061d84b314b", size = 13255976 },
-    { url = "https://files.pythonhosted.org/packages/5f/c3/ad2dd59d3cabbc12df308cced780f9c14367f0321e7800ca0fe52849da4c/ruff-0.9.4-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e0c93e7d47ed951b9394cf352d6695b31498e68fd5782d6cbc282425655f687a", size = 12752262 },
-    { url = "https://files.pythonhosted.org/packages/c7/17/5f1971e54bd71604da6788efd84d66d789362b1105e17e5ccc53bba0289b/ruff-0.9.4-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1d4c8772670aecf037d1bf7a07c39106574d143b26cfe5ed1787d2f31e800214", size = 14401648 },
-    { url = "https://files.pythonhosted.org/packages/30/24/6200b13ea611b83260501b6955b764bb320e23b2b75884c60ee7d3f0b68e/ruff-0.9.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfc5f1d7afeda8d5d37660eeca6d389b142d7f2b5a1ab659d9214ebd0e025231", size = 12414702 },
-    { url = "https://files.pythonhosted.org/packages/34/cb/f5d50d0c4ecdcc7670e348bd0b11878154bc4617f3fdd1e8ad5297c0d0ba/ruff-0.9.4-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:faa935fc00ae854d8b638c16a5f1ce881bc3f67446957dd6f2af440a5fc8526b", size = 11859608 },
-    { url = "https://files.pythonhosted.org/packages/d6/f4/9c8499ae8426da48363bbb78d081b817b0f64a9305f9b7f87eab2a8fb2c1/ruff-0.9.4-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:a6c634fc6f5a0ceae1ab3e13c58183978185d131a29c425e4eaa9f40afe1e6d6", size = 11485702 },
-    { url = "https://files.pythonhosted.org/packages/18/59/30490e483e804ccaa8147dd78c52e44ff96e1c30b5a95d69a63163cdb15b/ruff-0.9.4-py3-none-musllinux_1_2_i686.whl", hash = "sha256:433dedf6ddfdec7f1ac7575ec1eb9844fa60c4c8c2f8887a070672b8d353d34c", size = 12067782 },
-    { url = "https://files.pythonhosted.org/packages/3d/8c/893fa9551760b2f8eb2a351b603e96f15af167ceaf27e27ad873570bc04c/ruff-0.9.4-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:d612dbd0f3a919a8cc1d12037168bfa536862066808960e0cc901404b77968f0", size = 12483087 },
-    { url = "https://files.pythonhosted.org/packages/23/15/f6751c07c21ca10e3f4a51ea495ca975ad936d780c347d9808bcedbd7182/ruff-0.9.4-py3-none-win32.whl", hash = "sha256:db1192ddda2200671f9ef61d9597fcef89d934f5d1705e571a93a67fb13a4402", size = 9852302 },
-    { url = "https://files.pythonhosted.org/packages/12/41/2d2d2c6a72e62566f730e49254f602dfed23019c33b5b21ea8f8917315a1/ruff-0.9.4-py3-none-win_amd64.whl", hash = "sha256:05bebf4cdbe3ef75430d26c375773978950bbf4ee3c95ccb5448940dc092408e", size = 10850051 },
-    { url = "https://files.pythonhosted.org/packages/c6/e6/3d6ec3bc3d254e7f005c543a661a41c3e788976d0e52a1ada195bd664344/ruff-0.9.4-py3-none-win_arm64.whl", hash = "sha256:585792f1e81509e38ac5123492f8875fbc36f3ede8185af0a26df348e5154f41", size = 10078251 },
+version = "0.9.6"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/2a/e1/e265aba384343dd8ddd3083f5e33536cd17e1566c41453a5517b5dd443be/ruff-0.9.6.tar.gz", hash = "sha256:81761592f72b620ec8fa1068a6fd00e98a5ebee342a3642efd84454f3031dca9", size = 3639454 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/76/e3/3d2c022e687e18cf5d93d6bfa2722d46afc64eaa438c7fbbdd603b3597be/ruff-0.9.6-py3-none-linux_armv6l.whl", hash = "sha256:2f218f356dd2d995839f1941322ff021c72a492c470f0b26a34f844c29cdf5ba", size = 11714128 },
+    { url = "https://files.pythonhosted.org/packages/e1/22/aff073b70f95c052e5c58153cba735748c9e70107a77d03420d7850710a0/ruff-0.9.6-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b908ff4df65dad7b251c9968a2e4560836d8f5487c2f0cc238321ed951ea0504", size = 11682539 },
+    { url = "https://files.pythonhosted.org/packages/75/a7/f5b7390afd98a7918582a3d256cd3e78ba0a26165a467c1820084587cbf9/ruff-0.9.6-py3-none-macosx_11_0_arm64.whl", hash = "sha256:b109c0ad2ececf42e75fa99dc4043ff72a357436bb171900714a9ea581ddef83", size = 11132512 },
+    { url = "https://files.pythonhosted.org/packages/a6/e3/45de13ef65047fea2e33f7e573d848206e15c715e5cd56095589a7733d04/ruff-0.9.6-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1de4367cca3dac99bcbd15c161404e849bb0bfd543664db39232648dc00112dc", size = 11929275 },
+    { url = "https://files.pythonhosted.org/packages/7d/f2/23d04cd6c43b2e641ab961ade8d0b5edb212ecebd112506188c91f2a6e6c/ruff-0.9.6-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ac3ee4d7c2c92ddfdaedf0bf31b2b176fa7aa8950efc454628d477394d35638b", size = 11466502 },
+    { url = "https://files.pythonhosted.org/packages/b5/6f/3a8cf166f2d7f1627dd2201e6cbc4cb81f8b7d58099348f0c1ff7b733792/ruff-0.9.6-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5dc1edd1775270e6aa2386119aea692039781429f0be1e0949ea5884e011aa8e", size = 12676364 },
+    { url = "https://files.pythonhosted.org/packages/f5/c4/db52e2189983c70114ff2b7e3997e48c8318af44fe83e1ce9517570a50c6/ruff-0.9.6-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:4a091729086dffa4bd070aa5dab7e39cc6b9d62eb2bef8f3d91172d30d599666", size = 13335518 },
+    { url = "https://files.pythonhosted.org/packages/66/44/545f8a4d136830f08f4d24324e7db957c5374bf3a3f7a6c0bc7be4623a37/ruff-0.9.6-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d1bbc6808bf7b15796cef0815e1dfb796fbd383e7dbd4334709642649625e7c5", size = 12823287 },
+    { url = "https://files.pythonhosted.org/packages/c5/26/8208ef9ee7431032c143649a9967c3ae1aae4257d95e6f8519f07309aa66/ruff-0.9.6-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:589d1d9f25b5754ff230dce914a174a7c951a85a4e9270613a2b74231fdac2f5", size = 14592374 },
+    { url = "https://files.pythonhosted.org/packages/31/70/e917781e55ff39c5b5208bda384fd397ffd76605e68544d71a7e40944945/ruff-0.9.6-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc61dd5131742e21103fbbdcad683a8813be0e3c204472d520d9a5021ca8b217", size = 12500173 },
+    { url = "https://files.pythonhosted.org/packages/84/f5/e4ddee07660f5a9622a9c2b639afd8f3104988dc4f6ba0b73ffacffa9a8c/ruff-0.9.6-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:5e2d9126161d0357e5c8f30b0bd6168d2c3872372f14481136d13de9937f79b6", size = 11906555 },
+    { url = "https://files.pythonhosted.org/packages/f1/2b/6ff2fe383667075eef8656b9892e73dd9b119b5e3add51298628b87f6429/ruff-0.9.6-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:68660eab1a8e65babb5229a1f97b46e3120923757a68b5413d8561f8a85d4897", size = 11538958 },
+    { url = "https://files.pythonhosted.org/packages/3c/db/98e59e90de45d1eb46649151c10a062d5707b5b7f76f64eb1e29edf6ebb1/ruff-0.9.6-py3-none-musllinux_1_2_i686.whl", hash = "sha256:c4cae6c4cc7b9b4017c71114115db0445b00a16de3bcde0946273e8392856f08", size = 12117247 },
+    { url = "https://files.pythonhosted.org/packages/ec/bc/54e38f6d219013a9204a5a2015c09e7a8c36cedcd50a4b01ac69a550b9d9/ruff-0.9.6-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:19f505b643228b417c1111a2a536424ddde0db4ef9023b9e04a46ed8a1cb4656", size = 12554647 },
+    { url = "https://files.pythonhosted.org/packages/a5/7d/7b461ab0e2404293c0627125bb70ac642c2e8d55bf590f6fce85f508f1b2/ruff-0.9.6-py3-none-win32.whl", hash = "sha256:194d8402bceef1b31164909540a597e0d913c0e4952015a5b40e28c146121b5d", size = 9949214 },
+    { url = "https://files.pythonhosted.org/packages/ee/30/c3cee10f915ed75a5c29c1e57311282d1a15855551a64795c1b2bbe5cf37/ruff-0.9.6-py3-none-win_amd64.whl", hash = "sha256:03482d5c09d90d4ee3f40d97578423698ad895c87314c4de39ed2af945633caa", size = 10999914 },
+    { url = "https://files.pythonhosted.org/packages/e8/a8/d71f44b93e3aa86ae232af1f2126ca7b95c0f515ec135462b3e1f351441c/ruff-0.9.6-py3-none-win_arm64.whl", hash = "sha256:0e2bb706a2be7ddfea4a4af918562fdc1bcb16df255e5fa595bbd800ce322a5a", size = 10177499 },
 ]
 
 [[package]]
@@ -943,15 +939,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/e0/f9/0595336914c5619e5f28a1fb793285925a8cd4b432c9da0a987836c7f822/shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686", size = 9755 },
 ]
 
-[[package]]
-name = "six"
-version = "1.16.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", size = 34041 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254", size = 11053 },
-]
-
 [[package]]
 name = "sniffio"
 version = "1.3.1"
@@ -972,7 +959,7 @@ wheels = [
 
 [[package]]
 name = "solana"
-version = "0.36.3"
+version = "0.36.5"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "construct-typing" },
@@ -981,9 +968,9 @@ dependencies = [
     { name = "typing-extensions" },
     { name = "websockets" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/34/d6/5c8b044ab5d4566a74bd2880785ec0d8e5b5e0c5f90dc2a5245b114788c9/solana-0.36.3.tar.gz", hash = "sha256:b0d46ea1e196425945d78e50f541fd67fe3c116f411b950bbc8f33dd5aef5f19", size = 52018 }
+sdist = { url = "https://files.pythonhosted.org/packages/c8/e7/18ffc3d25e8f772f6b20d8dfd27a0d275576403e4d52def0a94021741506/solana-0.36.5.tar.gz", hash = "sha256:8c81de111903d01b3b5659130840ee1711092ab02982cf5e1ea851ed9ddcb011", size = 52108 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/a9/38/9495868167e8101e82ff2ec5b9db4e48561be9605b8f7c6bad9c84c8d530/solana-0.36.3-py3-none-any.whl", hash = "sha256:8d7c7e65d735b6e059cfc35d8fbde8edf6953cf9a9cc511d9db3a05953712625", size = 62180 },
+    { url = "https://files.pythonhosted.org/packages/f4/3f/9c6a8bff32b7b622ac1566c52bde16239290b9d1e042c1164bdba22fef8b/solana-0.36.5-py3-none-any.whl", hash = "sha256:6b2023ba8623841ccac96e73e374a9d0e0d450436d368178fdd0537ed308d04c", size = 62217 },
 ]
 
 [[package]]
@@ -1069,15 +1056,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ce/d9/5f4c13cecde62396b0d3fe530a50ccea91e7dfc1ccf0e09c228841bb5ba8/urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac", size = 126338 },
 ]
 
-[[package]]
-name = "webencodings"
-version = "0.5.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923", size = 9721 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/f4/24/2a3e3df732393fed8b3ebf2ec078f05546de641fe1b667ee316ec1dcf3b7/webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", size = 11774 },
-]
-
 [[package]]
 name = "websockets"
 version = "11.0.3"

mm_sol-0.3.6/src/mm_sol/cli/cmd/transfer_sol_cmd.py

@@ -1,159 +0,0 @@
-import sys
-import time
-from pathlib import Path
-from typing import Annotated, Self
-
-import mm_crypto_utils
-from loguru import logger
-from mm_crypto_utils import AddressToPrivate, TxRoute
-from mm_std import BaseConfig, Err, utc_now
-from pydantic import AfterValidator, BeforeValidator, Field, model_validator
-from rich.live import Live
-from rich.table import Table
-
-from mm_sol import transfer
-from mm_sol.balance import get_sol_balance_with_retries
-from mm_sol.cli import calcs, cli_utils
-from mm_sol.cli.calcs import calc_sol_expression
-from mm_sol.cli.validators import Validators
-from mm_sol.converters import lamports_to_sol
-
-
-# noinspection DuplicatedCode
-class Config(BaseConfig):
-    nodes: Annotated[list[str], BeforeValidator(Validators.nodes())]
-    routes: Annotated[list[TxRoute], BeforeValidator(Validators.sol_routes())]
-    private_keys: Annotated[AddressToPrivate, BeforeValidator(Validators.sol_private_keys())]
-    proxies: Annotated[list[str], Field(default_factory=list), BeforeValidator(Validators.proxies())]
-    value: Annotated[str, AfterValidator(Validators.valid_sol_expression("balance"))]
-    value_min_limit: Annotated[str | None, AfterValidator(Validators.valid_sol_expression())] = None
-    delay: Annotated[str | None, AfterValidator(Validators.valid_calc_decimal_value())] = 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:
-        if not self.private_keys.contains_all_addresses(self.from_addresses):
-            raise ValueError("private keys are not set for all addresses")
-
-        return self
-
-
-def run(
-    config_path: Path,
-    *,
-    print_balances: bool,
-    print_config: bool,
-    debug: bool,
-    no_confirmation: bool,
-    emulate: bool,
-) -> None:
-    config = Config.read_toml_config_or_exit(config_path)
-
-    if print_config:
-        config.print_and_exit({"private_keys"})
-
-    mm_crypto_utils.init_logger(debug, config.log_debug, config.log_info)
-
-    if print_balances:
-        _print_balances(config)
-        sys.exit(0)
-
-    _run_transfers(config, no_confirmation=no_confirmation, emulate=emulate)
-
-
-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'}) | {'version': cli_utils.get_version()}}")
-    for i, route in enumerate(config.routes):
-        _transfer(
-            from_address=route.from_address,
-            to_address=route.to_address,
-            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(*, from_address: str, to_address: str, config: Config, no_confirmation: bool, emulate: bool) -> None:
-    log_prefix = f"{from_address}->{to_address}"
-    fee = 5000
-    # get value
-    value_res = calcs.calc_sol_value_for_address(
-        nodes=config.nodes, value_expression=config.value, address=from_address, proxies=config.proxies, fee=fee
-    )
-    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 config.value_min_limit:
-        value_min_limit = calc_sol_expression(config.value_min_limit)
-        if value < value_min_limit:
-            logger.info(f"{log_prefix}: value<value_min_limit, value={lamports_to_sol(value, config.round_ndigits)}sol")
-            return
-
-    # emulate?
-    if emulate:
-        msg = f"{log_prefix}: emulate, value={lamports_to_sol(value, config.round_ndigits)}SOL,"
-        msg += f" fee={fee}"
-        logger.info(msg)
-        return
-
-    debug_tx_params = {"fee": fee, "value": value, "to": to_address}
-    logger.debug(f"{log_prefix}: tx_params={debug_tx_params}")
-
-    res = transfer.transfer_sol_with_retries(
-        nodes=config.nodes,
-        from_address=from_address,
-        private_key=config.private_keys[from_address],
-        to_address=to_address,
-        lamports=value,
-        proxies=config.proxies,
-        retries=3,
-    )
-
-    if isinstance(res, Err):
-        logger.info(f"{log_prefix}: send_error: {res.err}")
-        return
-    signature = res.ok
-
-    if no_confirmation:
-        msg = f"{log_prefix}: sig={signature}, value={lamports_to_sol(value, config.round_ndigits)}"
-        logger.info(msg)
-    else:
-        logger.debug(f"{log_prefix}: sig={signature}, waiting for confirmation")
-        status = "UNKNOWN"
-        if cli_utils.wait_confirmation(config.nodes, config.proxies, signature, log_prefix):
-            status = "OK"
-        msg = f"{log_prefix}: sig={signature}, value={lamports_to_sol(value, config.round_ndigits)}, status={status}"
-        logger.info(msg)
-
-
-def _print_balances(config: Config) -> None:
-    table = Table("n", "from_address", "sol", "to_address", "sol", title="balances")
-    with Live(table, refresh_per_second=0.5):
-        for count, route in enumerate(config.routes):
-            from_balance = _get_sol_balance_str(route.from_address, config)
-            to_balance = _get_sol_balance_str(route.to_address, config)
-            row: list[str] = [str(count), route.from_address, from_balance, route.to_address, to_balance]
-            table.add_row(*row)
-
-
-def _get_sol_balance_str(address: str, config: Config) -> str:
-    return get_sol_balance_with_retries(config.nodes, address, proxies=config.proxies, retries=5).map_or_else(
-        lambda err: err,
-        lambda ok: str(lamports_to_sol(ok, config.round_ndigits)),
-    )

mm_sol-0.3.6/src/mm_sol/cli/cmd/transfer_token_cmd.py

@@ -1,188 +0,0 @@
-import sys
-import time
-from pathlib import Path
-from typing import Annotated, Self
-
-import mm_crypto_utils
-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 rich.live import Live
-from rich.table import Table
-
-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.validators import Validators
-from mm_sol.converters import lamports_to_sol, to_token
-from mm_sol.token import get_decimals_with_retries
-
-
-# noinspection DuplicatedCode
-class Config(BaseConfig):
-    nodes: Annotated[list[str], BeforeValidator(Validators.nodes())]
-    routes: Annotated[list[TxRoute], BeforeValidator(Validators.sol_routes())]
-    private_keys: Annotated[AddressToPrivate, BeforeValidator(Validators.sol_private_keys())]
-    proxies: Annotated[list[str], Field(default_factory=list), BeforeValidator(Validators.proxies())]
-    token: Annotated[str, AfterValidator(Validators.sol_address())]
-    value: Annotated[str, AfterValidator(Validators.valid_token_expression("balance"))]
-    value_min_limit: Annotated[str | None, AfterValidator(Validators.valid_token_expression())] = None
-    delay: Annotated[str | None, AfterValidator(Validators.valid_calc_decimal_value())] = 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:
-        if not self.private_keys.contains_all_addresses(self.from_addresses):
-            raise ValueError("private keys are not set for all addresses")
-
-        return self
-
-
-def run(
-    config_path: Path,
-    *,
-    print_balances: bool,
-    print_config: bool,
-    debug: bool,
-    no_confirmation: bool,
-    emulate: bool,
-) -> None:
-    config = Config.read_toml_config_or_exit(config_path)
-
-    if print_config:
-        config.print_and_exit({"private_keys"})
-
-    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:
-        _print_balances(config, token_decimals)
-        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_for_address(
-        nodes=config.nodes,
-        value_expression=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
-    value_t = f"{to_token(value, decimals=token_decimals, ndigits=config.round_ndigits)}t"
-
-    # value_min_limit
-    if config.value_min_limit:
-        value_min_limit = calcs.calc_token_expression(config.value_min_limit, token_decimals)
-        if value < value_min_limit:
-            logger.info(f"{log_prefix}: value<value_min_limit, value={value_t}")
-            return
-
-    if emulate:
-        logger.info(f"{log_prefix}: emulate, value={value_t}, fee={fee}lamports")
-        return
-
-    logger.debug(f"{log_prefix}: value={to_token(value, decimals=token_decimals)}t, fee={fee}lamports")
-    res = transfer.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,
-        amount=value,
-        decimals=token_decimals,
-        proxies=config.proxies,
-        retries=3,
-    )
-
-    if isinstance(res, Err):
-        logger.info(f"{log_prefix}: send_error: {res.err}")
-        return
-    signature = res.ok
-
-    if no_confirmation:
-        msg = f"{log_prefix}: sig={signature}, value={value_t}"
-        logger.info(msg)
-    else:
-        logger.debug(f"{log_prefix}: sig={signature}, waiting for confirmation")
-        status = "UNKNOWN"
-        if cli_utils.wait_confirmation(config.nodes, config.proxies, signature, log_prefix):
-            status = "OK"
-        msg = f"{log_prefix}: sig={signature}, value={value_t}, status={status}"
-        logger.info(msg)
-
-
-def _print_balances(config: Config, token_decimals: int) -> None:
-    table = Table("n", "from_address", "sol", "t", "to_address", "sol", "t", title="balances")
-    with Live(table, refresh_per_second=0.5):
-        for count, route in enumerate(config.routes):
-            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, token_decimals)
-            to_t_balance = _get_token_balance_str(route.to_address, config, token_decimals)
-            row: list[str] = [
-                str(count),
-                route.from_address,
-                from_sol_balance,
-                from_t_balance,
-                route.to_address,
-                to_sol_balance,
-                to_t_balance,
-            ]
-            table.add_row(*row)
-
-
-def _get_sol_balance_str(address: str, config: Config) -> str:
-    return get_sol_balance_with_retries(config.nodes, address, proxies=config.proxies, retries=5).map_or_else(
-        lambda err: err,
-        lambda ok: str(lamports_to_sol(ok, config.round_ndigits)),
-    )
-
-
-def _get_token_balance_str(address: str, config: Config, token_decimals: int) -> str:
-    return get_token_balance_with_retries(config.nodes, address, config.token, proxies=config.proxies, retries=5).map_or_else(
-        lambda err: err,
-        lambda ok: str(to_token(ok, token_decimals, ndigits=config.round_ndigits)),
-    )

mm_sol-0.3.6/src/mm_sol/cli/examples/transfer-sol.toml

@@ -1,9 +0,0 @@
-routes = """
-Bd8CxCTLez2ckVTqEJjuZkWjYFSRbo8fA1qYbd7yFVP9 Eaft9xXzfgbRqsHd65WspoaxTtH7pkznM9YA8tsDKGwj
-Fc2TRJVCpFZpRz56mFnQETctib1zwFnwHcS7HoQSgUzZ EVJctTWikt29rUXBf49tyQdK87x837HtvpCwqeSjp1Ur
-"""
-private_keys = "file: ./path/to/privates.txt"
-value = "0.5balance - 0.012sol"
-delay = "random(5,10)"
-proxies = "url: https://site.com/api/get-proxies"
-nodes = "https://api.devnet.solana.com"

mm_sol-0.3.6/src/mm_sol/cli/examples/transfer-token.toml

@@ -1,9 +0,0 @@
-routes = """
-Bd8CxCTLez2ckVTqEJjuZkWjYFSRbo8fA1qYbd7yFVP9 Eaft9xXzfgbRqsHd65WspoaxTtH7pkznM9YA8tsDKGwj
-Fc2TRJVCpFZpRz56mFnQETctib1zwFnwHcS7HoQSgUzZ EVJctTWikt29rUXBf49tyQdK87x837HtvpCwqeSjp1Ur
-"""
-token = "6VBTMLgv256c7scudNf8T5GoTJcEE8WfgcJhxbGYPQ8G"
-private_keys = "file: ./path/to/privates.txt"
-value = "0.012 t"
-proxies = "https://site.com/api/get-proxies"
-nodes = "https://api.devnet.solana.com"