mm-btc 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

mm_btc/cli/cli.py

@@ -7,6 +7,7 @@ from mm_std import print_plain
 
 from mm_btc.cli import cli_utils
 from mm_btc.cli.cmd import address_cmd, create_tx_cmd, decode_tx_cmd, mnemonic_cmd, utxo_cmd
+from mm_btc.wallet import AddressType
 
 app = typer.Typer(no_args_is_help=True, pretty_exceptions_enable=False, add_completion=False)
 
@@ -17,6 +18,7 @@ def mnemonic_command(  # nosec B107:hardcoded_password_default
     mnemonic: Annotated[str, typer.Option("--mnemonic", "-m", help="")] = "",
     passphrase: Annotated[str, typer.Option("--passphrase", "-p")] = "",
     path: Annotated[str, typer.Option("--path", help="Derivation path. Examples: bip44, bip88, m/44'/0'/0'/0")] = "bip44",
+    address_type: Annotated[AddressType, typer.Option("--address-type", "-a", help="Bitcoin address type")] = AddressType.P2WPKH,
     hex_: Annotated[bool, typer.Option("--hex", help="Print private key in hex format instead of WIF")] = False,
     words: int = typer.Option(12, "--words", "-w", help="Number of mnemonic words"),
     limit: int = typer.Option(10, "--limit", "-l"),
@@ -30,6 +32,7 @@ def mnemonic_command(  # nosec B107:hardcoded_password_default
             words=words,
             limit=limit,
             path=path,
+            address_type=address_type,
             hex=hex_,
             testnet=testnet,
         )

mm_btc/cli/cmd/mnemonic_cmd.py

@@ -3,7 +3,7 @@ from enum import Enum
 
 from mm_std import print_plain
 
-from mm_btc.wallet import derive_accounts, generate_mnemonic
+from mm_btc.wallet import AddressType, derive_accounts, generate_mnemonic
 
 
 class PrivateType(str, Enum):
@@ -18,6 +18,7 @@ class Args:
     words: int
     limit: int
     hex: bool  # Print private key in hex format instead of WIF
+    address_type: AddressType
     path: str
     testnet: bool
 
@@ -26,7 +27,7 @@ def run(args: Args) -> None:
     mnemonic = args.mnemonic or generate_mnemonic()
     passphrase = args.passphrase
     path = get_derivation_path_prefix(args.path, args.testnet)
-    accounts = derive_accounts(mnemonic, passphrase, path, args.limit)
+    accounts = derive_accounts(mnemonic, passphrase, path, args.address_type, args.limit)
 
     print_plain(f"{mnemonic}")
     if passphrase:

mm_btc/wallet.py

@@ -1,8 +1,12 @@
 from dataclasses import dataclass
+from enum import Enum, unique
 
-from hdwallet import BIP44HDWallet, BIP84HDWallet
-from hdwallet.symbols import BTC, BTCTEST
-from hdwallet.utils import generate_mnemonic as new_mnemonic
+from hdwallet import HDWallet
+from hdwallet.cryptocurrencies import Bitcoin
+from hdwallet.derivations import CustomDerivation
+from hdwallet.hds import BIP32HD
+from hdwallet.mnemonics import BIP39Mnemonic
+from mnemonic import Mnemonic
 
 BIP44_MAINNET_PATH = "m/44'/0'/0'/0"
 BIP44_TESTNET_PATH = "m/44'/1'/0'/0"
@@ -18,30 +22,45 @@ class Account:
     path: str
 
 
+@unique
+class AddressType(str, Enum):
+    P2PKH = "P2PKH"  # Pay to Public Key Hash
+    P2SH = "P2SH"  # Pay to Script Hash
+    P2TR = "P2TR"  # Taproot
+    P2WPKH = "P2WPKH"  # Native SegWit
+    P2WPKH_IN_P2SH = "P2WPKH-In-P2SH"
+    P2WSH = "P2WSH"  # Native SegWit
+    P2WSH_IN_P2SH = "P2WSH-In-P2SH"
+
+
 def generate_mnemonic(language: str = "english", words: int = 12) -> str:
-    strength = mnemonic_words_to_strenght(words)
-    return new_mnemonic(language=language, strength=strength)  # type: ignore[no-any-return]
-
-
-def derive_accounts(mnemonic: str, passphrase: str, path: str, limit: int) -> list[Account]:
-    if path.startswith("m/84'/1'"):
-        w = BIP84HDWallet(symbol=BTCTEST)
-    elif path.startswith("m/44'/1'"):
-        w = BIP44HDWallet(symbol=BTCTEST)
-    elif path.startswith("m/84'/0'"):
-        w = BIP84HDWallet(symbol=BTC)
-    elif path.startswith("m/44'/0'"):
-        w = BIP44HDWallet(symbol=BTC)
+    return Mnemonic(language).generate(strength=mnemonic_words_to_strenght(words))
+
+
+def derive_accounts(mnemonic: str, passphrase: str, path_prefix: str, address_type: AddressType, limit: int) -> list[Account]:
+    coin = Bitcoin
+    if path_prefix.startswith("m/84'/1'"):
+        network = coin.NETWORKS.TESTNET
+    elif path_prefix.startswith("m/44'/1'"):
+        network = coin.NETWORKS.TESTNET
+    elif path_prefix.startswith("m/84'/0'"):
+        network = coin.NETWORKS.MAINNET
+    elif path_prefix.startswith("m/44'/0'"):
+        network = coin.NETWORKS.MAINNET
     else:
         raise ValueError("Invalid path")
 
-    w.from_mnemonic(mnemonic, passphrase=passphrase)
-    w.clean_derivation()
+    wallet = HDWallet(cryptocurrency=coin, network=network, hd=BIP32HD, passphrase=passphrase).from_mnemonic(
+        BIP39Mnemonic(mnemonic)
+    )
+    wallet.clean_derivation()
 
     accounts = []
     for index_path in range(limit):
-        w.from_path(path=f"{path}/{index_path}")
-        accounts.append(Account(address=w.address(), private=w.private_key(), wif=w.wif(), path=f"{path}/{index_path}"))
+        wallet.clean_derivation()
+        path = f"{path_prefix}/{index_path}"
+        w = wallet.from_derivation(derivation=CustomDerivation(path=path))
+        accounts.append(Account(address=w.address(address_type), private=w.private_key(), wif=w.wif(), path=path))
         w.clean_derivation()
 
     return accounts

mm_btc-0.1.3.dist-info/METADATA

@@ -0,0 +1,10 @@
+Metadata-Version: 2.4
+Name: mm-btc
+Version: 0.1.3
+Requires-Python: >=3.12
+Requires-Dist: bitcoinlib~=0.7.1
+Requires-Dist: bit~=0.8.0
+Requires-Dist: hdwallet~=3.2.0
+Requires-Dist: mm-std~=0.1.9
+Requires-Dist: mnemonic>=0.21
+Requires-Dist: typer>=0.15.1

{mm_btc-0.1.2.dist-info → mm_btc-0.1.3.dist-info}/RECORD

@@ -2,17 +2,17 @@ mm_btc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_btc/blockstream.py,sha256=U2_pc6RYAkFcCvH_WrxjIm13VNavyY3WgK8ePowV-Ic,3620
 mm_btc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_btc/tx.py,sha256=7KTMNuL1n8rRj_245BV1bH9M2_PctNvlvPsLEsRTYx4,245
-mm_btc/wallet.py,sha256=0ejOIl5gbm1oMO4WY3AsQRiF3PCrB4WC2LknaYPmMfY,1838
+mm_btc/wallet.py,sha256=E9XKZMQx48JiGRDG8ij7cbilNPVmcpmS6jAGBzXfV9U,2475
 mm_btc/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_btc/cli/cli.py,sha256=D_yQ_L7oBY9aJ3_TKeJOQmXFsx8yK3lmARTAsmMXjO8,2413
+mm_btc/cli/cli.py,sha256=uD49Nek6ZuBLnNOjGghSHv5eNPS2E6hTyCyjvvMOmGU,2620
 mm_btc/cli/cli_utils.py,sha256=g2o5ySLu-Tw8dZm84ZAsx8862yHij4sDfz4z6uLS2hw,102
 mm_btc/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_btc/cli/cmd/address_cmd.py,sha256=fipX9FiQ2EgCEq8nVN6ELnDMoR5KTIX7bpAaRK3t_yg,284
 mm_btc/cli/cmd/create_tx_cmd.py,sha256=dIuQBTOqTSefC6aMbrBN6Pq0EwV2G2ESM1tLU4WyFoU,690
 mm_btc/cli/cmd/decode_tx_cmd.py,sha256=0jGlUjnA1X2Q2aYwSBeAjqVNZIBsW5X2lEwIpSfWJsU,175
-mm_btc/cli/cmd/mnemonic_cmd.py,sha256=zAAHr9j0SLJX5BXoiMTZj8pIzTPX26aJEOUi7IN40Ug,1192
+mm_btc/cli/cmd/mnemonic_cmd.py,sha256=CY6tPsqOTNfM-4WhKDhqitCi2OeqSIUMEUTFIRGHwIg,1254
 mm_btc/cli/cmd/utxo_cmd.py,sha256=mp-lVLURpXFqO3IeBIEwnHusEvT5tFjUKxnRYC-rFqQ,294
-mm_btc-0.1.2.dist-info/METADATA,sha256=7f3giSslf4D6JXMCSSlm85n1RJTx3PSdD0m40DXnBiI,222
-mm_btc-0.1.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-mm_btc-0.1.2.dist-info/entry_points.txt,sha256=KphzLNE9eb9H1DO-L0gvBQaQT5ImedyVCN4a6svfiRg,46
-mm_btc-0.1.2.dist-info/RECORD,,
+mm_btc-0.1.3.dist-info/METADATA,sha256=XP2L_wEpJRZGBh2WG_hSaY6HMhkDPrqEIXf6R-z1pJE,252
+mm_btc-0.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_btc-0.1.3.dist-info/entry_points.txt,sha256=KphzLNE9eb9H1DO-L0gvBQaQT5ImedyVCN4a6svfiRg,46
+mm_btc-0.1.3.dist-info/RECORD,,

{mm_btc-0.1.2.dist-info → mm_btc-0.1.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

mm_btc-0.1.2.dist-info/METADATA

@@ -1,9 +0,0 @@
-Metadata-Version: 2.3
-Name: mm-btc
-Version: 0.1.2
-Requires-Python: >=3.12
-Requires-Dist: bitcoinlib~=0.7.0
-Requires-Dist: bit~=0.8.0
-Requires-Dist: hdwallet~=2.2.1
-Requires-Dist: mm-std~=0.1.6
-Requires-Dist: typer>=0.13.0