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

mm_btc/blockstream.py

@@ -1,5 +1,4 @@
 from collections.abc import Sequence
-from typing import TypeAlias
 
 from mm_std import Err, HResponse, Ok, Result, hr
 from mm_std.random_ import random_str_choice
@@ -11,7 +10,7 @@ TESTNET_BASE_URL = "https://blockstream.info/testnet/api"
 ERROR_INVALID_ADDRESS = "INVALID_ADDRESS"
 ERROR_INVALID_NETWORK = "INVALID_NETWORK"
 
-Proxy: TypeAlias = str | Sequence[str] | None
+type Proxy = str | Sequence[str] | None
 
 
 class Mempool(BaseModel):
@@ -54,7 +53,7 @@ class Utxo(BaseModel):
 
 
 class BlockstreamClient:
-    def __init__(self, testnet: bool = False, timeout: int = 10, proxies: Proxy = None, attempts: int = 1):
+    def __init__(self, testnet: bool = False, timeout: int = 10, proxies: Proxy = None, attempts: int = 1) -> None:
         self.testnet = testnet
         self.timeout = timeout
         self.proxies = proxies
@@ -72,7 +71,7 @@ class BlockstreamClient:
                     "invalid bitcoin address" in res.body.lower() or "bech32 segwit decoding error" in res.body.lower()
                 ):
                     return Err(ERROR_INVALID_ADDRESS, data=data)
-                elif res.code == 400 and "invalid network" in res.body.lower():
+                if res.code == 400 and "invalid network" in res.body.lower():
                     return Err(ERROR_INVALID_NETWORK, data=data)
                 return Ok(Address(**res.json), data=data)
             except Exception as err:

mm_btc/cli/cli.py

@@ -5,10 +5,11 @@ import typer
 import typer.core
 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
 
+from . import cli_utils
+from .cmd import address_cmd, create_tx_cmd, decode_tx_cmd, mnemonic_cmd, utxo_cmd
+
 app = typer.Typer(no_args_is_help=True, pretty_exceptions_enable=False, add_completion=False)
 
 
@@ -67,7 +68,7 @@ def utxo_command(address: str) -> None:
 def version_callback(value: bool) -> None:
     if value:
         print_plain(f"mm-btc: v{cli_utils.get_version()}")
-        raise typer.Exit()
+        raise typer.Exit
 
 
 @app.callback()

mm_btc/cli/cli_utils.py

@@ -1,5 +1,19 @@
 import importlib.metadata
+import sys
+from pathlib import Path
+
+from mm_std import BaseConfig
+from rich import print_json
 
 
 def get_version() -> str:
     return importlib.metadata.version("mm-btc")
+
+
+def read_config[T: BaseConfig](config_type: type[T], config_path: Path) -> T:
+    res = config_type.read_config(config_path)
+    if res.is_ok():
+        return res.unwrap()
+
+    print_json(res.err)
+    sys.exit(1)

mm_btc/cli/cmd/create_tx_cmd.py

@@ -3,6 +3,7 @@ from pathlib import Path
 from bit import PrivateKey, PrivateKeyTestnet
 from mm_std import BaseConfig, print_console
 
+from mm_btc.cli.cli_utils import read_config
 from mm_btc.wallet import is_testnet_address
 
 
@@ -17,7 +18,7 @@ class Config(BaseConfig):
 
 
 def run(config_path: Path) -> None:
-    config = Config.read_config(config_path)
+    config = read_config(Config, config_path)
     testnet = is_testnet_address(config.from_address)
     key = PrivateKeyTestnet(config.private) if testnet else PrivateKey(config.private)
 

mm_btc/wallet.py

@@ -39,13 +39,9 @@ def generate_mnemonic(language: str = "english", words: int = 12) -> str:
 
 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'"):
+    if path_prefix.startswith(("m/84'/1'", "m/44'/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'"):
+    elif path_prefix.startswith(("m/84'/0'", "m/44'/0'")):
         network = coin.NETWORKS.MAINNET
     else:
         raise ValueError("Invalid path")

mm_btc-0.2.1.dist-info/METADATA

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

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

@@ -1,18 +1,18 @@
 mm_btc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_btc/blockstream.py,sha256=U2_pc6RYAkFcCvH_WrxjIm13VNavyY3WgK8ePowV-Ic,3620
+mm_btc/blockstream.py,sha256=as3Rv_OsbdvclUEotxrXC8K5mwddxvznY3SuFscKkY4,3591
 mm_btc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_btc/tx.py,sha256=7KTMNuL1n8rRj_245BV1bH9M2_PctNvlvPsLEsRTYx4,245
-mm_btc/wallet.py,sha256=E9XKZMQx48JiGRDG8ij7cbilNPVmcpmS6jAGBzXfV9U,2475
+mm_btc/wallet.py,sha256=_pGTuAf6Y9KzaWTTSg_tn6WEoRsGqhxJuPof0_xyrmM,2333
 mm_btc/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_btc/cli/cli.py,sha256=uD49Nek6ZuBLnNOjGghSHv5eNPS2E6hTyCyjvvMOmGU,2620
-mm_btc/cli/cli_utils.py,sha256=g2o5ySLu-Tw8dZm84ZAsx8862yHij4sDfz4z6uLS2hw,102
+mm_btc/cli/cli.py,sha256=RleK9_widQ6OQEWU10qTRKvi7ooHKGE5JPYNOM9DfnM,2600
+mm_btc/cli/cli_utils.py,sha256=vNXTicMAyUWbPmdnAcBn5cCGON75ayZ6rVK8T5McgtQ,413
 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/create_tx_cmd.py,sha256=kD3lTc7sSDconCfB-PFHiH415ABeZ86kfkDwEw2jx50,736
 mm_btc/cli/cmd/decode_tx_cmd.py,sha256=0jGlUjnA1X2Q2aYwSBeAjqVNZIBsW5X2lEwIpSfWJsU,175
 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.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.2.1.dist-info/METADATA,sha256=uEDpGrymap4CQcZEBzNK9devojVPZ6aW8iLFrS9fczM,253
+mm_btc-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_btc-0.2.1.dist-info/entry_points.txt,sha256=KphzLNE9eb9H1DO-L0gvBQaQT5ImedyVCN4a6svfiRg,46
+mm_btc-0.2.1.dist-info/RECORD,,

mm_btc-0.1.3.dist-info/METADATA

@@ -1,10 +0,0 @@
-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