mm-sol 0.2.10__tar.gz → 0.3.1__tar.gz

{mm_sol-0.2.10 → mm_sol-0.3.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.2.10
+Version: 0.3.1
 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.4
 Requires-Dist: solana~=0.36.3
 Requires-Dist: typer>=0.15.1

{mm_sol-0.2.10 → mm_sol-0.3.1}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "mm-sol"
-version = "0.2.10"
+version = "0.3.1"
 description = ""
 requires-python = ">=3.12"
 dependencies = [
-    "mm-crypto-utils>=0.0.19",
+    "mm-crypto-utils>=0.1.4",
     "solana~=0.36.3",
     "base58~=2.1.1",
     "typer>=0.15.1",
@@ -25,7 +25,6 @@ dev-dependencies = [
     "pip-audit~=2.7.3",
     "bandit~=1.8.2",
     "mypy~=1.14.1",
-    "types-PyYAML~=6.0.12.20241230",
 ]
 
 [tool.mypy]

{mm_sol-0.2.10 → mm_sol-0.3.1}/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.10 → mm_sol-0.3.1}/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.10 → mm_sol-0.3.1}/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.10 → mm_sol-0.3.1}/src/mm_sol/cli/cmd/transfer_sol_cmd.py

@@ -42,7 +42,7 @@ class Config(BaseConfig):
 
 
 def run(
-    config_path: str,
+    config_path: Path,
     *,
     print_balances: bool,
     print_config: bool,
@@ -50,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.10 → mm_sol-0.3.1}/src/mm_sol/cli/cmd/transfer_token_cmd.py

@@ -44,7 +44,7 @@ class Config(BaseConfig):
 
 
 def run(
-    config_path: str,
+    config_path: Path,
     *,
     print_balances: bool,
     print_config: bool,
@@ -52,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.1/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.1/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.1/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.10 → mm_sol-0.3.1}/src/mm_sol/cli/validators.py

@@ -12,15 +12,15 @@ class Validators(ConfigValidators):
         return ConfigValidators.address(is_address)
 
     @staticmethod
-    def sol_addresses(unique: bool) -> Callable[[str | list[str] | None], list[str]]:
+    def sol_addresses(unique: bool) -> Callable[[str], list[str]]:
         return ConfigValidators.addresses(unique, is_address=is_address)
 
     @staticmethod
-    def sol_routes() -> Callable[[str | None], list[TxRoute]]:
+    def sol_routes() -> Callable[[str], list[TxRoute]]:
         return ConfigValidators.routes(is_address)
 
     @staticmethod
-    def sol_private_keys() -> Callable[[str | list[str] | None], AddressToPrivate]:
+    def sol_private_keys() -> Callable[[str], AddressToPrivate]:
         return ConfigValidators.private_keys(get_public_key)
 
     @staticmethod

{mm_sol-0.2.10 → mm_sol-0.3.1}/uv.lock

@@ -481,19 +481,19 @@ wheels = [
 
 [[package]]
 name = "mm-crypto-utils"
-version = "0.0.19"
+version = "0.1.4"
 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/b8/29/fb0a382faadf0ba377747a551e9136c0ad7f64286163de5d0e1e64ae3456/mm_crypto_utils-0.1.4-py3-none-any.whl", hash = "sha256:3b2e011959fa70f3498ea27b0e741d5e3915be771ec1de63729d8bd97b4d0ff4", size = 7733 },
 ]
 
 [[package]]
 name = "mm-sol"
-version = "0.2.10"
+version = "0.3.1"
 source = { editable = "." }
 dependencies = [
     { name = "base58" },
@@ -511,14 +511,13 @@ dev = [
     { name = "pytest" },
     { name = "pytest-xdist" },
     { name = "ruff" },
-    { name = "types-pyyaml" },
 ]
 
 [package.metadata]
 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.4" },
     { name = "solana", specifier = "~=0.36.3" },
     { name = "typer", specifier = ">=0.15.1" },
 ]
@@ -531,12 +530,11 @@ dev = [
     { name = "pytest", specifier = "~=8.3.4" },
     { name = "pytest-xdist", specifier = "~=3.6.1" },
     { name = "ruff", specifier = "~=0.9.4" },
-    { name = "types-pyyaml", specifier = "~=6.0.12.20241230" },
 ]
 
 [[package]]
 name = "mm-std"
-version = "0.1.15"
+version = "0.2.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "cryptography" },
@@ -548,7 +546,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]]
@@ -1042,15 +1040,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d0/cc/0a838ba5ca64dc832aa43f727bd586309846b0ffb2ce52422543e6075e8a/typer-0.15.1-py3-none-any.whl", hash = "sha256:7994fb7b8155b64d3402518560648446072864beefd44aa2dc36972a5972e847", size = 44908 },
 ]
 
-[[package]]
-name = "types-pyyaml"
-version = "6.0.12.20241230"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/9a/f9/4d566925bcf9396136c0a2e5dc7e230ff08d86fa011a69888dd184469d80/types_pyyaml-6.0.12.20241230.tar.gz", hash = "sha256:7f07622dbd34bb9c8b264fe860a17e0efcad00d50b5f27e93984909d9363498c", size = 17078 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/e8/c1/48474fbead512b70ccdb4f81ba5eb4a58f69d100ba19f17c92c0c4f50ae6/types_PyYAML-6.0.12.20241230-py3-none-any.whl", hash = "sha256:fa4d32565219b68e6dee5f67534c722e53c00d1cfc09c435ef04d7353e1e96e6", size = 20029 },
-]
-
 [[package]]
 name = "typing-extensions"
 version = "4.12.2"

mm_sol-0.2.10/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.10/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.10/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