mm-eth 0.4.0__tar.gz → 0.4.1__tar.gz

{mm_eth-0.4.0 → mm_eth-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mm-eth
-Version: 0.4.0
+Version: 0.4.1
 Requires-Python: >=3.12
 Requires-Dist: mm-crypto-utils>=0.1.5
 Requires-Dist: typer>=0.15.1

{mm_eth-0.4.0 → mm_eth-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mm-eth"
-version = "0.4.0"
+version = "0.4.1"
 description = ""
 requires-python = ">=3.12"
 dependencies = [

{mm_eth-0.4.0 → mm_eth-0.4.1}/src/mm_eth/account.py

@@ -13,9 +13,12 @@ Account.enable_unaudited_hdwallet_features()
 
 key_api = KeyAPI()
 
+DEFAULT_DERIVATION_PATH = "m/44'/60'/0'/0/{i}"
+
 
 @dataclass
-class NewAccount:
+class DerivedAccount:
+    index: int
     path: str
     address: str
     private_key: str
@@ -30,18 +33,15 @@ def generate_mnemonic(num_words: int = 24) -> str:
     return mnemonic.generate(num_words=num_words)
 
 
-def generate_accounts(  # nosec
-    mnemonic: str,
-    passphrase: str = "",
-    path_prefix: str = "m/44'/60'/0'/0",
-    limit: int = 12,
-) -> list[NewAccount]:
-    result: list[NewAccount] = []
+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: " + DEFAULT_DERIVATION_PATH)
+    result: list[DerivedAccount] = []
     for i in range(limit):
-        path = f"{path_prefix}/{i}"
-        acc = Account.from_mnemonic(mnemonic=mnemonic, account_path=path, passphrase=passphrase)
+        path = derivation_path.replace("{i}", str(i))
+        acc = Account.from_mnemonic(mnemonic, passphrase, path)
         private_key = acc.key.to_0x_hex().lower()
-        result.append(NewAccount(path, acc.address, private_key))
+        result.append(DerivedAccount(i, path, acc.address, private_key))
     return result
 
 

{mm_eth-0.4.0 → mm_eth-0.4.1}/src/mm_eth/cli/cli.py

@@ -5,6 +5,8 @@ from typing import Annotated
 import typer
 from mm_std import PrintFormat, print_plain
 
+from mm_eth.account import DEFAULT_DERIVATION_PATH
+
 from . import cli_utils
 from .cmd import (
     balance_cmd,
@@ -13,9 +15,7 @@ from .cmd import (
     deploy_cmd,
     encode_input_data_cmd,
     example_cmd,
-    mnemonic_cmd,
     node_cmd,
-    private_key_cmd,
     rpc_cmd,
     send_contract_cmd,
     solc_cmd,
@@ -29,6 +29,7 @@ from .cmd.call_contract_cmd import CallContractCmdParams
 from .cmd.deploy_cmd import DeployCmdParams
 from .cmd.send_contract_cmd import SendContractCmdParams
 from .cmd.transfer_cmd import TransferCmdParams
+from .cmd.wallet import mnemonic_cmd, private_key_cmd
 
 app = typer.Typer(no_args_is_help=True, pretty_exceptions_enable=False, add_completion=False)
 
@@ -74,9 +75,10 @@ def node_command(
 @wallet_app.command(name="mnemonic", help="Generate eth accounts based on a mnemonic")
 def mnemonic_command(  # nosec
     mnemonic: Annotated[str, typer.Option("--mnemonic", "-m")] = "",
-    passphrase: Annotated[str, typer.Option("--passphrase", "-pass")] = "",
+    passphrase: Annotated[str, typer.Option("--passphrase", "-p")] = "",
     print_path: bool = typer.Option(False, "--print_path"),
-    path_prefix: Annotated[str, typer.Option("--path")] = "m/44'/60'/0'/0",
+    derivation_path: Annotated[str, typer.Option("--path")] = DEFAULT_DERIVATION_PATH,
+    words: int = typer.Option(12, "--words", "-w", help="Number of mnemonic words"),
     limit: int = typer.Option(10, "--limit", "-l"),
     save_file: str = typer.Option("", "--save", "-s", help="Save private keys to a file"),
 ) -> None:
@@ -85,7 +87,8 @@ def mnemonic_command(  # nosec
         passphrase=passphrase,
         print_path=print_path,
         limit=limit,
-        path_prefix=path_prefix,
+        words=words,
+        derivation_path=derivation_path,
         save_file=save_file,
     )
 

{mm_eth-0.4.0/src/mm_eth/cli/cmd → mm_eth-0.4.1/src/mm_eth/cli/cmd/wallet}/mnemonic_cmd.py

@@ -3,18 +3,18 @@ from typing import Any
 
 from mm_std import print_json
 
-from mm_eth.account import generate_accounts, generate_mnemonic
+from mm_eth.account import derive_accounts, generate_mnemonic
 
 
-def run(mnemonic: str, passphrase: str, limit: int, print_path: bool, path_prefix: str, save_file: str) -> None:  # nosec
+def run(mnemonic: str, passphrase: str, words: int, derivation_path: str, limit: int, print_path: bool, save_file: str) -> None:  # nosec
     result: dict[str, Any] = {}
     if not mnemonic:
-        mnemonic = generate_mnemonic()
+        mnemonic = generate_mnemonic(num_words=words)
     result["mnemonic"] = mnemonic
     if passphrase:
         result["passphrase"] = passphrase
     result["accounts"] = []
-    for acc in generate_accounts(mnemonic=mnemonic, passphrase=passphrase, limit=limit, path_prefix=path_prefix):
+    for acc in derive_accounts(mnemonic=mnemonic, passphrase=passphrase, limit=limit, derivation_path=derivation_path):
         new_account = {"address": acc.address, "private": acc.private_key}
         if print_path:
             new_account["path"] = acc.path

{mm_eth-0.4.0 → mm_eth-0.4.1}/tests/test_account.py

@@ -1,4 +1,5 @@
 from mm_eth import account
+from mm_eth.account import DEFAULT_DERIVATION_PATH
 
 
 def test_generate_mnemonic():
@@ -8,7 +9,14 @@ def test_generate_mnemonic():
 
 
 def test_generate_accounts():
-    assert len(account.generate_accounts(account.generate_mnemonic(), limit=17)) == 17
+    mnemonic = "tuition skin amateur sail oak bone panel concert horse need panel balance"
+    passphrase = "pass-secret"
+    res = account.derive_accounts(mnemonic, passphrase, DEFAULT_DERIVATION_PATH, 7)
+    assert len(res) == 7
+    assert res[3].index == 3
+    assert res[3].path == "m/44'/60'/0'/0/3"
+    assert res[3].address == "0x2F9e1b9f4D11756E84d4b6D2f6B107FA37feB701"
+    assert res[3].private_key == "0x7b222a59ac8496b4f1f623bc86d15e889af8406f796037888ddee1290b933183"
 
 
 def test_to_checksum_address():

{mm_eth-0.4.0 → mm_eth-0.4.1}/uv.lock

@@ -738,7 +738,7 @@ wheels = [
 
 [[package]]
 name = "mm-eth"
-version = "0.4.0"
+version = "0.4.1"
 source = { editable = "." }
 dependencies = [
     { name = "mm-crypto-utils" },