mm-btc 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

mm_btc/blockstream.py

@@ -69,14 +69,14 @@ class BlockstreamClient:
             res = await self._request(f"/address/{address}")
             try:
                 if res.status_code == 400:
-                    return res.to_err("400 Bad Request")
-                return res.to_ok(Address(**res.parse_json_body()))
+                    return res.to_result_err("400 Bad Request")
+                return res.to_result_ok(Address(**res.parse_json_body()))
             except Exception as e:
-                result = res.to_err(e)
+                result = res.to_result_err(e)
         return result
 
     async def get_confirmed_balance(self, address: str) -> Result[int]:
-        return (await self.get_address(address)).and_then(
+        return (await self.get_address(address)).chain(
             lambda a: Result.ok(a.chain_stats.funded_txo_sum - a.chain_stats.spent_txo_sum)
         )
 
@@ -85,9 +85,9 @@ class BlockstreamClient:
         for _ in range(self.attempts):
             res = await self._request(f"/address/{address}/utxo")
             try:
-                return res.to_ok([Utxo(**out) for out in res.parse_json_body()])
+                return res.to_result_ok([Utxo(**out) for out in res.parse_json_body()])
             except Exception as e:
-                result = res.to_err(e)
+                result = res.to_result_err(e)
         return result
 
     async def get_mempool(self) -> Result[Mempool]:
@@ -95,9 +95,9 @@ class BlockstreamClient:
         for _ in range(self.attempts):
             res = await self._request("/mempool")
             try:
-                return res.to_ok(Mempool(**res.parse_json_body()))
+                return res.to_result_ok(Mempool(**res.parse_json_body()))
             except Exception as e:
-                result = res.to_err(e)
+                result = res.to_result_err(e)
         return result
 
     async def _request(self, url: str) -> HttpResponse:

mm_btc/cli/cli.py

@@ -5,7 +5,6 @@ from typing import Annotated
 
 import mm_print
 import typer
-import typer.core
 
 from mm_btc.wallet import AddressType
 
@@ -68,7 +67,7 @@ def utxo_command(address: str) -> None:
 
 def version_callback(value: bool) -> None:
     if value:
-        mm_print.print_plain(f"mm-btc: v{importlib.metadata.version('mm-btc')}")
+        mm_print.plain(f"mm-btc: v{importlib.metadata.version('mm-btc')}")
         raise typer.Exit
 
 

mm_btc/cli/cmd/address_cmd.py

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

mm_btc/cli/cmd/create_tx_cmd.py

@@ -2,13 +2,13 @@ from pathlib import Path
 
 import mm_print
 from bit import PrivateKey, PrivateKeyTestnet
-from mm_cryptocurrency import BaseConfig
+from mm_cryptocurrency import CryptocurrencyConfig
 
 from mm_btc.wallet import is_testnet_address
 
 
-class Config(BaseConfig):
-    class Output(BaseConfig):
+class Config(CryptocurrencyConfig):
+    class Output(CryptocurrencyConfig):
         address: str
         amount: int
 
@@ -25,4 +25,4 @@ def run(config_path: Path) -> None:
     outputs = [(o.address, o.amount, "satoshi") for o in config.outputs]
 
     tx = key.create_transaction(outputs)
-    mm_print.print_json(tx)
+    mm_print.json(tx)

mm_btc/cli/cmd/decode_tx_cmd.py

@@ -5,4 +5,4 @@ from mm_btc.tx import decode_tx
 
 def run(tx_hex: str, testnet: bool = False) -> None:
     res = decode_tx(tx_hex, testnet)
-    mm_print.print_json(res)
+    mm_print.json(res)

mm_btc/cli/cmd/mnemonic_cmd.py

@@ -29,12 +29,12 @@ def run(args: Args) -> None:
     path = get_derivation_path_prefix(args.path, args.testnet)
     accounts = derive_accounts(mnemonic, passphrase, path, args.address_type, args.limit)
 
-    mm_print.print_plain(f"{mnemonic}")
+    mm_print.plain(f"{mnemonic}")
     if passphrase:
-        mm_print.print_plain(f"{passphrase}")
+        mm_print.plain(f"{passphrase}")
     for acc in accounts:
         private = acc.private if args.hex else acc.wif
-        mm_print.print_plain(f"{acc.path} {acc.address} {private}")
+        mm_print.plain(f"{acc.path} {acc.address} {private}")
 
 
 def get_derivation_path_prefix(path: str, testnet: bool) -> str:

mm_btc/cli/cmd/utxo_cmd.py

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

{mm_btc-0.5.0.dist-info → mm_btc-0.5.2.dist-info}/METADATA

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: mm-btc
-Version: 0.5.0
+Version: 0.5.2
 Requires-Python: >=3.13
 Requires-Dist: bitcoinlib~=0.7.4
 Requires-Dist: bit~=0.8.0
 Requires-Dist: hdwallet~=3.4.0
-Requires-Dist: mm-cryptocurrency~=0.4.1
-Requires-Dist: mm-print>=0.0.1
+Requires-Dist: mm-cryptocurrency~=0.4.7
 Requires-Dist: mnemonic~=0.21
 Requires-Dist: typer~=0.16.0

mm_btc-0.5.2.dist-info/RECORD

@@ -0,0 +1,17 @@
+mm_btc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_btc/blockstream.py,sha256=-8-h07gld3GAOMXb7DcZaBJMzaxmKSWEdkdn55wIA5A,3361
+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=vmrvmOxjyl6mSkz-OUOTn5pmJ_emRS_pCM1ZAaF6SsA,2626
+mm_btc/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_btc/cli/cmd/address_cmd.py,sha256=8gzARLHv7wVg30SAgK9JDiZbJK0e0YFus4b2Y5NGey0,302
+mm_btc/cli/cmd/create_tx_cmd.py,sha256=vjLfDQX0q6HPoQ0w6SCPXrqaMte5EI0n2U4EV9Hn8jU,745
+mm_btc/cli/cmd/decode_tx_cmd.py,sha256=oNOVX1_XIBdj0rY7ZMiwdNLVBvBHdnK0niJsXSulxXo,164
+mm_btc/cli/cmd/mnemonic_cmd.py,sha256=N3qaQfoivODj4EQIFn4fN0ULZon7rmoETqJPy3YnKbg,1248
+mm_btc/cli/cmd/utxo_cmd.py,sha256=6xGzi6RhXXUOgvNAFNWMWmO9AIDRWOVh_0X-jaCdeM4,299
+mm_btc-0.5.2.dist-info/METADATA,sha256=FJo7dLqAtKA1_86FZ5RSEUOkKORFGJ4zkYR3B98K4zY,263
+mm_btc-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_btc-0.5.2.dist-info/entry_points.txt,sha256=KphzLNE9eb9H1DO-L0gvBQaQT5ImedyVCN4a6svfiRg,46
+mm_btc-0.5.2.dist-info/RECORD,,

mm_btc-0.5.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-mm_btc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_btc/blockstream.py,sha256=OGhJAlBoI_oPEJUdzsLKENF29nFGhrVdWp0o4APaDXQ,3315
-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=PU93remvTcn_uguET2gf9-vgGZ_zZduHbqvvQHH_2Zw,2650
-mm_btc/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_btc/cli/cmd/address_cmd.py,sha256=UlthdplJKAH1sC7MHtM4-rGS0MKftaaCdg_u-2tgwE0,308
-mm_btc/cli/cmd/create_tx_cmd.py,sha256=4NvPa7uT7eJcoBo_oVOLLudCpKvNIB_ScK8ko57MOXE,721
-mm_btc/cli/cmd/decode_tx_cmd.py,sha256=OwSdxIA8GViABb1JbbZTLi5HIRIA5Tpp_dBkh9x3GQQ,170
-mm_btc/cli/cmd/mnemonic_cmd.py,sha256=-qWo8AXMdSSYUwyvx4jP54buRuidJM-1q3O8UwnJCF0,1266
-mm_btc/cli/cmd/utxo_cmd.py,sha256=531bTIsgeQYmwJ17Jyn5jYlDDChOGlrvkJ31EIFIdF4,305
-mm_btc-0.5.0.dist-info/METADATA,sha256=ciB5k1Ts4VNXpaeK9yKntdm55zllNatRiay-SVN_nGM,294
-mm_btc-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_btc-0.5.0.dist-info/entry_points.txt,sha256=KphzLNE9eb9H1DO-L0gvBQaQT5ImedyVCN4a6svfiRg,46
-mm_btc-0.5.0.dist-info/RECORD,,