mm-eth 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

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/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/cli/cmd/{mnemonic_cmd.py → 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.dist-info → mm_eth-0.4.1.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 mm_eth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_eth/abi.py,sha256=Qf-QOsR9QexyQM9XWKNeTMkRarIL3XQJbaDbJ8ifMrw,4856
-mm_eth/account.py,sha256=VjyWOYX5K9ZgdJsHp_I3m-lJ5g9FDo3OJ3knqUPs_TM,1924
+mm_eth/account.py,sha256=k0MNMatBe0zo1iKZiB_Tq6zyEIo22IncD6ewNUJp3dY,2075
 mm_eth/anvil.py,sha256=98RCfI7dEpxFBTV6UErYvubWVP3n0ctUFn1--4kZ84U,1603
 mm_eth/constants.py,sha256=Cy_G-IleBH4gAZ4ok8AGHHlqmdW0ZM7ZldyVpzAfWLs,54
 mm_eth/deploy.py,sha256=SB3ruY808_5UnG8kHR34uVP66P3zOWZu0ImKD7UUv2s,691
@@ -16,7 +16,7 @@ mm_eth/utils.py,sha256=sSxt9GZEntZlT0RU8ht9Qon875HPhpd-1JjgqUBEfVo,7405
 mm_eth/vault.py,sha256=h8NyiOQh5YFskh1lZA3KyvnJUnxl9769ME2ChplG0CM,1477
 mm_eth/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_eth/cli/calcs.py,sha256=cLFTYNAN-I53tUiSg-zFfVr2afjIZPftDDjHj16FBz0,1068
-mm_eth/cli/cli.py,sha256=SdfOq4hSI2V8rgbSG0LTXqicE8dmIdLDBfSstSPhDfA,9019
+mm_eth/cli/cli.py,sha256=0UYDtNrCXvJqs836tPxsQHs7yTKjvAGL3qgWiXVhnDU,9208
 mm_eth/cli/cli_utils.py,sha256=yBIS3dGid75zyxw8crPOQHA4p3Krk5BoA2g01turKmQ,1712
 mm_eth/cli/print_helpers.py,sha256=yOiOFjTKloumwf07AqNIHQswUo8t0yuT9bpeGBGl60Q,1470
 mm_eth/cli/rpc_helpers.py,sha256=FMV-QVNM3v9X8H_-DP0hjNRqmm7KOnfzkw9bP17Qbz0,4499
@@ -28,9 +28,7 @@ mm_eth/cli/cmd/call_contract_cmd.py,sha256=RbBPvyUEQ45hQINYDKkx1yWhPygdymVKlRL26
 mm_eth/cli/cmd/deploy_cmd.py,sha256=0oBp_RZw_DIEtBFRc6QKdAw5oouwwpDIdeXvuyP9xdU,1272
 mm_eth/cli/cmd/encode_input_data_cmd.py,sha256=9UQ1MKPEFQJ8j_COsP3KGKhwOf9tT3feBezI8vvxTlw,267
 mm_eth/cli/cmd/example_cmd.py,sha256=o4NTll3fjmspbKjZ0sHGDRHTZ1RcFNHZDi9Ka0VNoDQ,264
-mm_eth/cli/cmd/mnemonic_cmd.py,sha256=Mb0H0inSNCa93GEPxGYQi7BnPe11mnLjnspfe7h54I4,972
 mm_eth/cli/cmd/node_cmd.py,sha256=Ae5yPxxnNiHw3tZcojS7KwNLM4gEfLhsTfhZp_86rqU,1956
-mm_eth/cli/cmd/private_key_cmd.py,sha256=Fv_2OLog1h32pIP7PJITwl_pHdy3BXvaDRcXZsxY1xo,241
 mm_eth/cli/cmd/rpc_cmd.py,sha256=02q82YqgbPezfEBmV_QBCIeNReE7ktkPych8Xr9ann8,2186
 mm_eth/cli/cmd/send_contract_cmd.py,sha256=JX3L1Dz4CBySfa2Pf87E8grauPu0U6xIyyOus81285Y,7316
 mm_eth/cli/cmd/solc_cmd.py,sha256=tBpeMdPfGs2iQIMaIJAAhMh1a3KyXHwyninfXPVpsgs,677
@@ -38,10 +36,13 @@ mm_eth/cli/cmd/token_cmd.py,sha256=4y6ZQpLOJ33_iNuKpm9tZXh4RntWhmPUcizgaNNBzaw,1
 mm_eth/cli/cmd/transfer_cmd.py,sha256=nC1Jiqe6zDJQvK9xVhB8mCbkEB1ZgMZmA393tDnZ1Dw,12176
 mm_eth/cli/cmd/tx_cmd.py,sha256=PIenXYTT60Z2fqsivpzybCLI2Z_tlcz-asm3B0JLHgI,517
 mm_eth/cli/cmd/vault_cmd.py,sha256=MOM1CILIaaqown1I-Fgo22ckqIMLtFt8t2D3fWNp798,606
+mm_eth/cli/cmd/wallet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_eth/cli/cmd/wallet/mnemonic_cmd.py,sha256=xE-5Ux9BdYsTZYBy0dMn9jupGhW4ced-AgYscy_wU_4,1007
+mm_eth/cli/cmd/wallet/private_key_cmd.py,sha256=Fv_2OLog1h32pIP7PJITwl_pHdy3BXvaDRcXZsxY1xo,241
 mm_eth/cli/examples/balances.toml,sha256=i_ALpiEcf8-0TFiUg1cgJhxxfHYeBl9x0b3tnUWjswU,421
 mm_eth/cli/examples/call_contract.toml,sha256=ZQWK-409V_vLIZ2bsRD5RCWPPzShPz2KJTTRQY4YaGw,248
 mm_eth/cli/examples/transfer.toml,sha256=HLVpkCNakZFE8qdFdDUoBPk7ZBdfEmk9TLZtooRsGAc,1198
-mm_eth-0.4.0.dist-info/METADATA,sha256=WjvTV6bG2379Zk0cJkuMX6xhAlVSi_YeqVhS4IyBFfI,207
-mm_eth-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_eth-0.4.0.dist-info/entry_points.txt,sha256=aGhpsozl8NIrkuUcX5fSgURCcDhr3ShUdeTSIrJq4oc,46
-mm_eth-0.4.0.dist-info/RECORD,,
+mm_eth-0.4.1.dist-info/METADATA,sha256=aMEeaP5awNBZ0ZhRIxmhTl1jennR_TAdETFamw4F9HU,207
+mm_eth-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_eth-0.4.1.dist-info/entry_points.txt,sha256=aGhpsozl8NIrkuUcX5fSgURCcDhr3ShUdeTSIrJq4oc,46
+mm_eth-0.4.1.dist-info/RECORD,,