mm-sol 0.2.9__py3-none-any.whl → 0.3.0__py3-none-any.whl

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/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/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/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/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/cli/examples/balances.toml

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

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/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.dist-info → mm_sol-0.3.0.dist-info}/METADATA

@@ -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.dist-info → mm_sol-0.3.0.dist-info}/RECORD

@@ -12,23 +12,23 @@ mm_sol/transfer.py,sha256=Gu6UYEjY5OECSusKJO-VA8C3B7W6ZJGjegUv67EQdfs,5809
 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=p0urdRiho7Q8DgvUdH79wiujnnf3VIG24uKcFpmF-Yw,4556
+mm_sol/cli/cli.py,sha256=CWzpH96zmODarCm4gfrj6_jXCPdPI-tMmbtqMYdnMqA,4584
 mm_sol/cli/cli_utils.py,sha256=Skj0SCHPWMHGr2ag-em1JtIK9Qdh7xeJafMzvCgChnc,2254
 mm_sol/cli/validators.py,sha256=_HEMOG7ojGKNp8AHX9tXpo9ZDCeRJ85coI-5MO3u95s,1209
 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=P2WRCqJXKo36Pqfe-ZrpguggVmpXTMXr-hQeji6-Bb0,2184
-mm_sol/cli/cmd/example_cmd.py,sha256=bK_z4du0UPGAoiHnYdi6iaZim_kKlYw4NKBbzvyes28,221
+mm_sol/cli/cmd/balances_cmd.py,sha256=mLKulZnmWGixzbzYYvb4dUvJcNPKFHnNyk3WnuAmKio,2215
+mm_sol/cli/cmd/example_cmd.py,sha256=M5dvRg9jvpVUwxvMRiRnO77aKR7c57bMY9booxMAswM,222
 mm_sol/cli/cmd/node_cmd.py,sha256=2AEAjq2M9f8-RZiI0rif6wITdns9QUb4Kr34QPsI2CA,238
-mm_sol/cli/cmd/transfer_sol_cmd.py,sha256=eRLKkr8ur3tNt_OG8pQapFqSLrzW7u9irKIpNbDWFuM,5035
-mm_sol/cli/cmd/transfer_token_cmd.py,sha256=8d_cTsMP1NnwdCBgM-hVxDjwXsTe3CHgoL2JEuknvWQ,5633
+mm_sol/cli/cmd/transfer_sol_cmd.py,sha256=ZBdkb7YrR88foT3zobMZGnDYAHWgx8ljkxRKpkWyM0w,5313
+mm_sol/cli/cmd/transfer_token_cmd.py,sha256=NCaSdO-eud-ef7SdWyTwWdSLiBegYAHySvKz22_j1cg,5911
 mm_sol/cli/cmd/wallet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/cli/cmd/wallet/keypair_cmd.py,sha256=cRHVVTs9zNYmUozZ8ZlJoutn9V6r8I1AEHBrszR7dTE,538
 mm_sol/cli/cmd/wallet/new_cmd.py,sha256=hcP9NZPkwYkTBEvT5rBntFtCIvx1QnPGn5FUDnvz5sM,425
-mm_sol/cli/examples/balances.yml,sha256=SoFcf_IhgA2zrbihrVpqm-ikes80wLFGVzafrjO00UY,290
-mm_sol/cli/examples/transfer-sol.yml,sha256=d0kO2FHNEXMD6WSjOk6X7PtDuaGAAQWn098k8z5bgbs,347
-mm_sol/cli/examples/transfer-token.yml,sha256=d8-3GE6NeM5zXo9S6WA8OP6pHjoEZvf7mtu9JwS5SZY,392
-mm_sol-0.2.9.dist-info/METADATA,sha256=YqSKksvBVs1tF2FlFiGe8rrPjqR3rbaftUHr4NKEtlQ,230
-mm_sol-0.2.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_sol-0.2.9.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
-mm_sol-0.2.9.dist-info/RECORD,,
+mm_sol/cli/examples/balances.toml,sha256=8WvnKD1yUz51K1Rd3kkDQI5uOmRwE7DH8paibI-i1uM,262
+mm_sol/cli/examples/transfer-sol.toml,sha256=1LdkhSBC0y5oMJXjm8MVIMyZruIrYSIm3LBDGmcS5Iw,353
+mm_sol/cli/examples/transfer-token.toml,sha256=I_Wof-APv-h6xeYVq0zbWfLbpDny2kz9U0xJifVNEtU,401
+mm_sol-0.3.0.dist-info/METADATA,sha256=RVZeWBCGk30AhpqEFhuXZ8g4DcrmHelApVVa-9PgecY,229
+mm_sol-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.3.0.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.3.0.dist-info/RECORD,,

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/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/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