mm-sol 0.2.9__tar.gz → 0.3.0__tar.gz

{mm_sol-0.2.9 → mm_sol-0.3.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.2.9
+Version: 0.3.0
 Requires-Python: >=3.12
 Requires-Dist: base58~=2.1.1
 Requires-Dist: jinja2>=3.1.5
-Requires-Dist: mm-crypto-utils>=0.0.19
+Requires-Dist: mm-crypto-utils~=0.1.1
 Requires-Dist: solana~=0.36.3
 Requires-Dist: typer>=0.15.1

{mm_sol-0.2.9 → mm_sol-0.3.0}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "mm-sol"
-version = "0.2.9"
+version = "0.3.0"
 description = ""
 requires-python = ">=3.12"
 dependencies = [
-    "mm-crypto-utils>=0.0.19",
+    "mm-crypto-utils~=0.1.1",
     "solana~=0.36.3",
     "base58~=2.1.1",
     "typer>=0.15.1",

{mm_sol-0.2.9 → mm_sol-0.3.0}/src/mm_sol/cli/cli.py

@@ -1,4 +1,5 @@
 from enum import Enum
+from pathlib import Path
 from typing import Annotated
 
 import typer
@@ -50,14 +51,14 @@ def balance_command(
 
 @app.command(name="balances", help="Print SOL and token balances for accounts")
 def balances_command(
-    config_path: str, print_config: Annotated[bool, typer.Option("--config", "-c", help="Print config and exit")] = False
+    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(
-    config_path: str,
+    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"),
@@ -76,7 +77,7 @@ def transfer_sol_command(
 
 @app.command(name="transfer-token", help="Transfer token from one or many accounts")
 def transfer_token_command(
-    config_path: str,
+    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"),

{mm_sol-0.2.9 → mm_sol-0.3.0}/src/mm_sol/cli/cmd/balances_cmd.py

@@ -1,5 +1,6 @@
 import random
 from decimal import Decimal
+from pathlib import Path
 from typing import Annotated, Any
 
 from mm_crypto_utils import ConfigValidators
@@ -23,8 +24,8 @@ class Config(BaseConfig):
         return random.choice(self.nodes)
 
 
-def run(config_path: str, print_config: bool) -> None:
-    config = Config.read_config_or_exit(config_path)
+def run(config_path: Path, print_config: bool) -> None:
+    config = Config.read_toml_config_or_exit(config_path)
     if print_config:
         config.print_and_exit()
 

{mm_sol-0.2.9 → mm_sol-0.3.0}/src/mm_sol/cli/cmd/example_cmd.py

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

{mm_sol-0.2.9 → mm_sol-0.3.0}/src/mm_sol/cli/cmd/transfer_sol_cmd.py

@@ -1,13 +1,13 @@
 import sys
 import time
 from pathlib import Path
-from typing import Annotated
+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
+from pydantic import AfterValidator, BeforeValidator, model_validator
 
 from mm_sol import transfer
 from mm_sol.cli import calcs, cli_utils
@@ -33,9 +33,16 @@ class Config(BaseConfig):
     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: str,
+    config_path: Path,
     *,
     print_balances: bool,
     print_config: bool,
@@ -43,7 +50,7 @@ def run(
     no_confirmation: bool,
     emulate: bool,
 ) -> None:
-    config = Config.read_config_or_exit(config_path)
+    config = Config.read_toml_config_or_exit(config_path)
 
     if print_config:
         config.print_and_exit({"private_keys"})

{mm_sol-0.2.9 → mm_sol-0.3.0}/src/mm_sol/cli/cmd/transfer_token_cmd.py

@@ -1,14 +1,14 @@
 import sys
 import time
 from pathlib import Path
-from typing import Annotated
+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
+from pydantic import AfterValidator, BeforeValidator, model_validator
 
 from mm_sol import transfer
 from mm_sol.cli import calcs, cli_utils
@@ -35,9 +35,16 @@ class Config(BaseConfig):
     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: str,
+    config_path: Path,
     *,
     print_balances: bool,
     print_config: bool,
@@ -45,7 +52,7 @@ def run(
     no_confirmation: bool,
     emulate: bool,
 ) -> None:
-    config = Config.read_config_or_exit(config_path)
+    config = Config.read_toml_config_or_exit(config_path)
 
     if print_config:
         config.print_and_exit({"private_keys"})

mm_sol-0.3.0/src/mm_sol/cli/examples/balances.toml

@@ -0,0 +1,9 @@
+accounts = """
+5BJ9ViMj4gi2BBX3wbCEJ4p4vpVWKpG6ja2aQP2ACBUv
+HbSAUDjzpr44fWzf9Ynj3V1jq3wBsgg88N88P4vzeGPX
+"""
+tokens = """
+7XtmNSHJDHTZdx2K1S8D529kHsBbt3Civxt6vUHrGxBR
+65FKbLPtrssmc8aVn9DEBY8VTGB85vsgadrmaW9H4nEB
+"""
+nodes = "https://api.mainnet-beta.solana.com"

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

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

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

@@ -0,0 +1,9 @@
+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"

{mm_sol-0.2.9 → mm_sol-0.3.0}/uv.lock

@@ -481,19 +481,19 @@ wheels = [
 
 [[package]]
 name = "mm-crypto-utils"
-version = "0.0.19"
+version = "0.1.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "loguru" },
     { name = "mm-std" },
 ]
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/49/0b/408f661aba09bfc3625652a6cf2ba516874aaaa4f6c9eaaeca450cf70004/mm_crypto_utils-0.0.19-py3-none-any.whl", hash = "sha256:b51184a53aa78cb70253c3c2e0ad56a98a214a854ffb74a4130a4401cd025538", size = 6992 },
+    { url = "https://files.pythonhosted.org/packages/0f/e2/9cb771e5af1d555b1fe34a9b8f301b8ae62f2ec3a53b2599232dcb5af221/mm_crypto_utils-0.1.1-py3-none-any.whl", hash = "sha256:5f743d4e2f100e05c932d3a1819115dd37212dece8ed444025263daa0ea88402", size = 7327 },
 ]
 
 [[package]]
 name = "mm-sol"
-version = "0.2.9"
+version = "0.3.0"
 source = { editable = "." }
 dependencies = [
     { name = "base58" },
@@ -518,7 +518,7 @@ dev = [
 requires-dist = [
     { name = "base58", specifier = "~=2.1.1" },
     { name = "jinja2", specifier = ">=3.1.5" },
-    { name = "mm-crypto-utils", specifier = ">=0.0.19" },
+    { name = "mm-crypto-utils", specifier = "~=0.1.1" },
     { name = "solana", specifier = "~=0.36.3" },
     { name = "typer", specifier = ">=0.15.1" },
 ]
@@ -536,7 +536,7 @@ dev = [
 
 [[package]]
 name = "mm-std"
-version = "0.1.15"
+version = "0.2.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "cryptography" },
@@ -548,7 +548,7 @@ dependencies = [
     { name = "rich" },
 ]
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ee/b7/6c713eb013fd2d0b2d5dca0f96b1ecb25f464f43f00f172f0c8314c4e82a/mm_std-0.1.15-py3-none-any.whl", hash = "sha256:2138cd0606f85fa3b56172218b19dfdcfb192600a762bcb0b50e13dba3cf75fe", size = 14850 },
+    { url = "https://files.pythonhosted.org/packages/f3/ef/cb423cc357cc116313fcd97e9d0ff673234f5f1725f4a73929ced27b1d00/mm_std-0.2.1-py3-none-any.whl", hash = "sha256:71fa84f2fa897901c925614327123e8d0bc6ae61ff7873479dc9a53889442237", size = 14620 },
 ]
 
 [[package]]

mm_sol-0.2.9/src/mm_sol/cli/examples/balances.yml

@@ -1,11 +0,0 @@
-accounts: |
-  5BJ9ViMj4gi2BBX3wbCEJ4p4vpVWKpG6ja2aQP2ACBUv
-  HbSAUDjzpr44fWzf9Ynj3V1jq3wBsgg88N88P4vzeGPX
-
-tokens: |
-  7XtmNSHJDHTZdx2K1S8D529kHsBbt3Civxt6vUHrGxBR
-  65FKbLPtrssmc8aVn9DEBY8VTGB85vsgadrmaW9H4nEB
-
-nodes: |
-  https://api.mainnet-beta.solana.com
-#  https://rpc.ankr.com/solana

mm_sol-0.2.9/src/mm_sol/cli/examples/transfer-sol.yml

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

mm_sol-0.2.9/src/mm_sol/cli/examples/transfer-token.yml

@@ -1,11 +0,0 @@
-routes: |
-  Bd8CxCTLez2ckVTqEJjuZkWjYFSRbo8fA1qYbd7yFVP9 Eaft9xXzfgbRqsHd65WspoaxTtH7pkznM9YA8tsDKGwj
-  Fc2TRJVCpFZpRz56mFnQETctib1zwFnwHcS7HoQSgUzZ EVJctTWikt29rUXBf49tyQdK87x837HtvpCwqeSjp1Ur
-token: 6VBTMLgv256c7scudNf8T5GoTJcEE8WfgcJhxbGYPQ8G
-
-private_keys_file: ./path/to/privates.txt
-value: 0.012 t
-
-proxies_url: https://site.com/api/get-proxies
-nodes: |
-  https://api.devnet.solana.com