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

mm_btc/blockstream.py

@@ -1,14 +1,15 @@
 from collections.abc import Sequence
 
-from mm_std import Err, HResponse, Ok, Result, hr
-from mm_std.random_ import random_str_choice
+from mm_std import HttpResponse, Result, http_request, random_str_choice
 from pydantic import BaseModel
 
 MAINNET_BASE_URL = "https://blockstream.info/api"
 TESTNET_BASE_URL = "https://blockstream.info/testnet/api"
 
-ERROR_INVALID_ADDRESS = "INVALID_ADDRESS"
-ERROR_INVALID_NETWORK = "INVALID_NETWORK"
+# ERROR_INVALID_ADDRESS = "INVALID_ADDRESS"
+# ERROR_INVALID_NETWORK = "INVALID_NETWORK"
+
+ERROR_400_BAD_REQUEST = "400 Bad Request"
 
 type Proxy = str | Sequence[str] | None
 
@@ -53,57 +54,49 @@ class Utxo(BaseModel):
 
 
 class BlockstreamClient:
-    def __init__(self, testnet: bool = False, timeout: int = 10, proxies: Proxy = None, attempts: int = 1) -> None:
+    def __init__(self, testnet: bool = False, timeout: float = 5, proxies: Proxy = None, attempts: int = 1) -> None:
         self.testnet = testnet
         self.timeout = timeout
         self.proxies = proxies
         self.attempts = attempts
         self.base_url = TESTNET_BASE_URL if testnet else MAINNET_BASE_URL
 
-    def get_address(self, address: str) -> Result[Address]:
-        result: Result[Address] = Err("not started yet")
-        data = None
+    async def get_address(self, address: str) -> Result[Address]:
+        result: Result[Address] = Result.failure("not started yet")
         for _ in range(self.attempts):
+            res = await self._request(f"/address/{address}")
             try:
-                res = self._request(f"/address/{address}")
-                data = res.to_dict()
-                if res.code == 400 and (
-                    "invalid bitcoin address" in res.body.lower() or "bech32 segwit decoding error" in res.body.lower()
-                ):
-                    return Err(ERROR_INVALID_ADDRESS, data=data)
-                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:
-                result = Err(err, data=data)
+                if res.status_code == 400:
+                    return res.to_result_failure("400 Bad Request")
+                return res.to_result_success(Address(**res.parse_json_body()))
+            except Exception as e:
+                result = res.to_result_failure(e)
         return result
 
-    def get_confirmed_balance(self, address: str) -> Result[int]:
-        return self.get_address(address).and_then(lambda a: Ok(a.chain_stats.funded_txo_sum - a.chain_stats.spent_txo_sum))
+    async def get_confirmed_balance(self, address: str) -> Result[int]:
+        return (await self.get_address(address)).and_then(
+            lambda a: Result.success(a.chain_stats.funded_txo_sum - a.chain_stats.spent_txo_sum)
+        )
 
-    def get_utxo(self, address: str) -> Result[list[Utxo]]:
-        result: Result[list[Utxo]] = Err("not started yet")
-        data = None
+    async def get_utxo(self, address: str) -> Result[list[Utxo]]:
+        result: Result[list[Utxo]] = Result.failure("not started yet")
         for _ in range(self.attempts):
+            res = await self._request(f"/address/{address}/utxo")
             try:
-                res = self._request(f"/address/{address}/utxo")
-                data = res.to_dict()
-                return Ok([Utxo(**out) for out in res.json], data=data)
-            except Exception as err:
-                result = Err(err, data=data)
+                return res.to_result_success([Utxo(**out) for out in res.parse_json_body()])
+            except Exception as e:
+                result = res.to_result_failure(e)
         return result
 
-    def get_mempool(self) -> Result[Mempool]:
-        result: Result[Mempool] = Err("not started yet")
-        data = None
+    async def get_mempool(self) -> Result[Mempool]:
+        result: Result[Mempool] = Result.failure("not started yet")
         for _ in range(self.attempts):
+            res = await self._request("/mempool")
             try:
-                res = self._request("/mempool")
-                data = res.to_dict()
-                return Ok(Mempool(**res.json), data=data)
-            except Exception as err:
-                result = Err(err, data=data)
+                return res.to_result_success(Mempool(**res.parse_json_body()))
+            except Exception as e:
+                result = res.to_result_failure(e)
         return result
 
-    def _request(self, url: str) -> HResponse:
-        return hr(f"{self.base_url}{url}", timeout=self.timeout, proxy=random_str_choice(self.proxies))
+    async def _request(self, url: str) -> HttpResponse:
+        return await http_request(f"{self.base_url}{url}", timeout=self.timeout, proxy=random_str_choice(self.proxies))

mm_btc/cli/cli.py

@@ -1,3 +1,5 @@
+import asyncio
+import importlib.metadata
 from pathlib import Path
 from typing import Annotated
 
@@ -7,7 +9,6 @@ from mm_std import print_plain
 
 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)
@@ -44,7 +45,7 @@ def mnemonic_command(  # nosec B107:hardcoded_password_default
 @app.command(name="a", hidden=True)
 def address_command(address: str) -> None:
     """Get address info from Blockstream API"""
-    address_cmd.run(address)
+    asyncio.run(address_cmd.run(address))
 
 
 @app.command("create-tx")
@@ -62,12 +63,12 @@ def decode_tx_command(tx_hex: str, testnet: Annotated[bool, typer.Option("--test
 @app.command("utxo")
 def utxo_command(address: str) -> None:
     """Get UTXOs from Blockstream API"""
-    utxo_cmd.run(address)
+    asyncio.run(utxo_cmd.run(address))
 
 
 def version_callback(value: bool) -> None:
     if value:
-        print_plain(f"mm-btc: v{cli_utils.get_version()}")
+        print_plain(f"mm-btc: v{importlib.metadata.version('mm-btc')}")
         raise typer.Exit
 
 

mm_btc/cli/cmd/address_cmd.py

@@ -4,7 +4,7 @@ from mm_btc.blockstream import BlockstreamClient
 from mm_btc.wallet import is_testnet_address
 
 
-def run(address: str) -> None:
+async def run(address: str) -> None:
     client = BlockstreamClient(testnet=is_testnet_address(address))
-    res = client.get_address(address)
-    print_json(res)
+    res = await client.get_address(address)
+    print_json(res.ok_or_error())

mm_btc/cli/cmd/create_tx_cmd.py

@@ -3,7 +3,6 @@ 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
 
 
@@ -18,7 +17,7 @@ class Config(BaseConfig):
 
 
 def run(config_path: Path) -> None:
-    config = read_config(Config, config_path)
+    config = Config.read_toml_config_or_exit(config_path)
     testnet = is_testnet_address(config.from_address)
     key = PrivateKeyTestnet(config.private) if testnet else PrivateKey(config.private)
 

mm_btc/cli/cmd/utxo_cmd.py

@@ -4,8 +4,7 @@ from mm_btc.blockstream import BlockstreamClient
 from mm_btc.wallet import is_testnet_address
 
 
-def run(address: str) -> None:
+async def run(address: str) -> None:
     client = BlockstreamClient(testnet=is_testnet_address(address))
-    res = client.get_utxo(address)
-
-    print_json(res.ok_or_err())
+    res = await client.get_utxo(address)
+    print_json(res.ok_or_error())

mm_btc-0.4.0.dist-info/METADATA

@@ -0,0 +1,10 @@
+Metadata-Version: 2.4
+Name: mm-btc
+Version: 0.4.0
+Requires-Python: >=3.12
+Requires-Dist: bitcoinlib~=0.7.3
+Requires-Dist: bit~=0.8.0
+Requires-Dist: hdwallet~=3.4.0
+Requires-Dist: mm-crypto-utils>=0.3.1
+Requires-Dist: mnemonic~=0.21
+Requires-Dist: typer~=0.15.2

mm_btc-0.4.0.dist-info/RECORD

@@ -0,0 +1,17 @@
+mm_btc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_btc/blockstream.py,sha256=cJyECppf4qjnDHDrwdZUzQTJ0RIHTR5ykhqoedAzQsk,3371
+mm_btc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_btc/tx.py,sha256=7KTMNuL1n8rRj_245BV1bH9M2_PctNvlvPsLEsRTYx4,245
+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=peUio3WAa2oXomZvq-87QAbuTP37CPNoq5RAG7ax3ns,2656
+mm_btc/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_btc/cli/cmd/address_cmd.py,sha256=PCjOEpZbMqBKpaAJnDHzYSqRnQEqHKqxN-w5c1Xq6jQ,310
+mm_btc/cli/cmd/create_tx_cmd.py,sha256=QHhfA91FGWf5r6DkWTaXInZJi6HYLfxueA1GtcBD2-s,703
+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=B3vI2BPWMSPVvMLGBctJw-C9k9vVLUg4nKFEIYNtmgY,307
+mm_btc-0.4.0.dist-info/METADATA,sha256=nDKkAIMrgMP6GntwePrLKr8_LDN6AEPOLluK2Gfo_7U,261
+mm_btc-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_btc-0.4.0.dist-info/entry_points.txt,sha256=KphzLNE9eb9H1DO-L0gvBQaQT5ImedyVCN4a6svfiRg,46
+mm_btc-0.4.0.dist-info/RECORD,,

mm_btc/cli/cli_utils.py

@@ -1,19 +0,0 @@
-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-0.2.1.dist-info/METADATA

@@ -1,10 +0,0 @@
-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.2.1.dist-info/RECORD

@@ -1,18 +0,0 @@
-mm_btc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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=_pGTuAf6Y9KzaWTTSg_tn6WEoRsGqhxJuPof0_xyrmM,2333
-mm_btc/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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=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.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,,