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

mm_sol/account.py

@@ -1,15 +1,20 @@
 import contextlib
 import random
+from dataclasses import dataclass
 
 import base58
 import pydash
 from mm_std import Err, Ok, Result
+from mnemonic import Mnemonic
 from pydantic import BaseModel
 from solana.rpc.api import Client
 from solders.keypair import Keypair
 from solders.pubkey import Pubkey
 from solders.rpc.responses import GetAccountInfoResp
 
+PHANTOM_DERIVATION_PATH = "m/44'/501'/{i}'/0'"
+WORD_STRENGTH = {12: 128, 15: 160, 18: 192, 21: 224, 24: 256}
+
 
 class NewAccount(BaseModel):
     public_key: str
@@ -17,6 +22,42 @@ class NewAccount(BaseModel):
     private_key_arr: list[int]
 
 
+@dataclass
+class DerivedAccount:
+    index: int
+    path: str
+    address: str
+    private_key: str
+
+
+def generate_mnemonic(num_words: int = 24) -> str:
+    if num_words not in WORD_STRENGTH:
+        raise ValueError(f"num_words must be one of {list(WORD_STRENGTH.keys())}")
+    mnemonic = Mnemonic("english")
+    return mnemonic.generate(strength=WORD_STRENGTH[num_words])
+
+
+def derive_accounts(mnemonic: str, passphrase: str, derivation_path: str, limit: int) -> list[DerivedAccount]:
+    if "{i}" not in derivation_path:
+        raise ValueError("derivation_path must contain {i}, for example: m/44'/501'/{i}'/0'")
+
+    result: list[DerivedAccount] = []
+    seed = Mnemonic.to_seed(mnemonic, passphrase)
+    for i in range(limit):
+        path = derivation_path.replace("{i}", str(i))
+        keypair = Keypair.from_seed_and_derivation_path(seed, path)
+        result.append(
+            DerivedAccount(
+                index=i,
+                path=path,
+                address=str(keypair.pubkey()),
+                private_key=base58.b58encode(bytes(keypair.to_bytes_array())).decode("utf-8"),
+            )
+        )
+
+    return result
+
+
 def generate_account() -> NewAccount:
     keypair = Keypair()
     public_key = str(keypair.pubkey())

mm_sol/cli/cli.py

@@ -5,9 +5,11 @@ from typing import Annotated
 import typer
 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.wallet import keypair_cmd, new_cmd
+from .cmd.wallet import keypair_cmd, mnemonic_cmd
 
 app = typer.Typer(no_args_is_help=True, pretty_exceptions_enable=False, add_completion=False)
 
@@ -102,12 +104,15 @@ def node_command(
     node_cmd.run(urls, proxy)
 
 
-@wallet_app.command(name="new", help="Generate new accounts")
-def generate_accounts_command(
-    limit: Annotated[int, typer.Option("--limit", "-l")] = 5,
-    array: Annotated[bool, typer.Option("--array", help="Print private key in the array format.")] = False,
+@wallet_app.command(name="mnemonic", help="Derive accounts from a mnemonic")
+@wallet_app.command(name="m", hidden=True)
+def wallet_mnemonic_command(  # nosec
+    mnemonic: Annotated[str, typer.Option("--mnemonic", "-m")] = "",
+    passphrase: Annotated[str, typer.Option("--passphrase", "-p")] = "",
+    derivation_path: Annotated[str, typer.Option("--path")] = PHANTOM_DERIVATION_PATH,
+    limit: int = typer.Option(10, "--limit", "-l"),
 ) -> None:
-    new_cmd.run(limit, array)
+    mnemonic_cmd.run(mnemonic, passphrase, derivation_path, limit)
 
 
 @wallet_app.command(name="keypair", help="Print public, private_base58, private_arr by a private key")

mm_sol/cli/cmd/wallet/mnemonic_cmd.py

@@ -0,0 +1,19 @@
+from dataclasses import asdict
+from typing import Any
+
+from mm_std import print_json
+
+from mm_sol.account import derive_accounts, generate_mnemonic
+
+
+def run(mnemonic: str, passphrase: str, derivation_path: str, limit: int) -> None:  # nosec
+    result: dict[str, Any] = {}
+    if not mnemonic:
+        mnemonic = generate_mnemonic()
+    result["mnemonic"] = mnemonic
+    if passphrase:
+        result["passphrase"] = passphrase
+    accounts = derive_accounts(mnemonic=mnemonic, passphrase=passphrase, derivation_path=derivation_path, limit=limit)
+
+    result["accounts"] = [asdict(acc) for acc in accounts]
+    print_json(result)

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

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

{mm_sol-0.3.0.dist-info → mm_sol-0.3.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mm_sol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_sol/account.py,sha256=32PR3kAoZJLEtKzwfWeQXnMxZeFO8NVXjG8HnHpnJgM,3225
+mm_sol/account.py,sha256=0pjvNxwhpmDHoXY3oTY2fNlQHoWPmlS77r8JcP8lAy4,4545
 mm_sol/balance.py,sha256=Idx7h9yhRLbrIEDFCBI5QSHE7OT2pYWEZrbHj9XFrkM,3147
 mm_sol/block.py,sha256=4Lc4TANgpGvPflVumC9MR-3vIl1dedGyci3cgzczuds,1794
 mm_sol/constants.py,sha256=WSpfz5_cq_8XbIrNFJGu9okwbfPTL00zsyR_k9-7O0o,29
@@ -12,9 +12,9 @@ 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=CWzpH96zmODarCm4gfrj6_jXCPdPI-tMmbtqMYdnMqA,4584
+mm_sol/cli/cli.py,sha256=Au_NjmvvX4A482nBP-b95tlARWEvqjTIo2CYIx0vyok,4854
 mm_sol/cli/cli_utils.py,sha256=Skj0SCHPWMHGr2ag-em1JtIK9Qdh7xeJafMzvCgChnc,2254
-mm_sol/cli/validators.py,sha256=_HEMOG7ojGKNp8AHX9tXpo9ZDCeRJ85coI-5MO3u95s,1209
+mm_sol/cli/validators.py,sha256=HLCFRrBOdyAMj_ibdAkkP36y9Zm2Dt3gMKoyPOcaiQE,1164
 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=mLKulZnmWGixzbzYYvb4dUvJcNPKFHnNyk3WnuAmKio,2215
@@ -24,11 +24,11 @@ mm_sol/cli/cmd/transfer_sol_cmd.py,sha256=ZBdkb7YrR88foT3zobMZGnDYAHWgx8ljkxRKpk
 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/cmd/wallet/mnemonic_cmd.py,sha256=dw6KmgNGYl2pW0JTCNri4pj-GJ3BdOia6Ef37prJydU,631
 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-0.3.2.dist-info/METADATA,sha256=K4DNT0cuwNpzt-AqiVtbW--s9-l5s0EQtaLCWfORNAU,259
+mm_sol-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.3.2.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.3.2.dist-info/RECORD,,

mm_sol/cli/cmd/wallet/new_cmd.py

@@ -1,14 +0,0 @@
-from mm_std import print_json
-
-from mm_sol.account import generate_account, get_private_key_arr_str
-
-
-def run(limit: int, array: bool) -> None:
-    result = {}
-    for _ in range(limit):
-        acc = generate_account()
-        private_key = acc.private_key_base58
-        if array:
-            private_key = get_private_key_arr_str(acc.private_key_base58)
-        result[acc.public_key] = private_key
-    print_json(result)