bittensor-cli 9.9.0__py3-none-any.whl → 9.10.0__py3-none-any.whl

bittensor_cli/src/commands/wallets.py

@@ -3,7 +3,7 @@ import itertools
 import json
 import os
 from collections import defaultdict
-from typing import Generator, Optional
+from typing import Generator, Optional, Union
 
 import aiohttp
 from bittensor_wallet import Wallet, Keypair
@@ -48,6 +48,7 @@ from bittensor_cli.src.bittensor.utils import (
     WalletLike,
     blocks_to_duration,
     decode_account_id,
+    get_hotkey_pub_ss58,
 )
 
 
@@ -159,7 +160,7 @@ async def regen_coldkey(
                                 "name": new_wallet.name,
                                 "path": new_wallet.path,
                                 "hotkey": new_wallet.hotkey_str,
-                                "hotkey_ss58": new_wallet.hotkey.ss58_address,
+                                "hotkey_ss58": get_hotkey_pub_ss58(new_wallet),
                                 "coldkey_ss58": new_wallet.coldkeypub.ss58_address,
                             },
                             "error": "",
@@ -209,7 +210,7 @@ async def regen_coldkey_pub(
                                 "name": new_coldkeypub.name,
                                 "path": new_coldkeypub.path,
                                 "hotkey": new_coldkeypub.hotkey_str,
-                                "hotkey_ss58": new_coldkeypub.hotkey.ss58_address,
+                                "hotkey_ss58": get_hotkey_pub_ss58(new_coldkeypub),
                                 "coldkey_ss58": new_coldkeypub.coldkeypub.ss58_address,
                             },
                             "error": "",
@@ -255,7 +256,7 @@ async def regen_hotkey(
             console.print(
                 "\n✅ [dark_sea_green]Regenerated hotkey successfully!\n",
                 f"[dark_sea_green]Wallet name: ({new_hotkey_.name}), path: ({new_hotkey_.path}), "
-                f"hotkey ss58: ({new_hotkey_.hotkey.ss58_address})",
+                f"hotkey ss58: ({new_hotkey_.hotkeypub.ss58_address})",
             )
             if json_output:
                 json_console.print(
@@ -266,7 +267,7 @@ async def regen_hotkey(
                                 "name": new_hotkey_.name,
                                 "path": new_hotkey_.path,
                                 "hotkey": new_hotkey_.hotkey_str,
-                                "hotkey_ss58": new_hotkey_.hotkey.ss58_address,
+                                "hotkey_ss58": new_hotkey_.hotkeypub.ss58_address,
                                 "coldkey_ss58": new_hotkey_.coldkeypub.ss58_address,
                             },
                             "error": "",
@@ -287,6 +288,50 @@ async def regen_hotkey(
             )
 
 
+async def regen_hotkey_pub(
+    wallet: Wallet,
+    ss58_address: str,
+    public_key_hex: str,
+    overwrite: Optional[bool] = False,
+    json_output: bool = False,
+):
+    """Creates a new hotkeypub under this wallet."""
+    try:
+        new_hotkeypub = wallet.regenerate_hotkeypub(
+            ss58_address=ss58_address,
+            public_key=public_key_hex,
+            overwrite=overwrite,
+        )
+        if isinstance(new_hotkeypub, Wallet):
+            console.print(
+                "\n✅ [dark_sea_green]Regenerated coldkeypub successfully!\n",
+                f"[dark_sea_green]Wallet name: ({new_hotkeypub.name}), path: ({new_hotkeypub.path}), "
+                f"coldkey ss58: ({new_hotkeypub.coldkeypub.ss58_address})",
+            )
+            if json_output:
+                json_console.print(
+                    json.dumps(
+                        {
+                            "success": True,
+                            "data": {
+                                "name": new_hotkeypub.name,
+                                "path": new_hotkeypub.path,
+                                "hotkey": new_hotkeypub.hotkey_str,
+                                "hotkey_ss58": new_hotkeypub.hotkeypub.ss58_address,
+                                "coldkey_ss58": new_hotkeypub.coldkeypub.ss58_address,
+                            },
+                            "error": "",
+                        }
+                    )
+                )
+    except KeyFileError:
+        print_error("KeyFileError: File is not writable")
+        if json_output:
+            json_console.print(
+                '{"success": false, "error": "Keyfile is not writable", "data": null}'
+            )
+
+
 async def new_hotkey(
     wallet: Wallet,
     n_words: int,
@@ -323,7 +368,7 @@ async def new_hotkey(
                             "name": wallet.name,
                             "path": wallet.path,
                             "hotkey": wallet.hotkey_str,
-                            "hotkey_ss58": wallet.hotkey.ss58_address,
+                            "hotkey_ss58": get_hotkey_pub_ss58(wallet),
                             "coldkey_ss58": wallet.coldkeypub.ss58_address,
                         },
                         "error": "",
@@ -402,19 +447,24 @@ async def wallet_create(
     json_output: bool = False,
 ):
     """Creates a new wallet."""
-    output_dict = {"success": False, "error": "", "data": None}
+    output_dict: dict[str, Optional[Union[bool, str, dict]]] = {
+        "success": False,
+        "error": "",
+        "data": None,
+    }
     if uri:
         try:
             keypair = Keypair.create_from_uri(uri)
             wallet.set_coldkey(keypair=keypair, encrypt=False, overwrite=False)
             wallet.set_coldkeypub(keypair=keypair, encrypt=False, overwrite=False)
             wallet.set_hotkey(keypair=keypair, encrypt=False, overwrite=False)
+            wallet.set_coldkeypub(keypair=keypair, encrypt=False, overwrite=False)
             output_dict["success"] = True
             output_dict["data"] = {
                 "name": wallet.name,
                 "path": wallet.path,
                 "hotkey": wallet.hotkey_str,
-                "hotkey_ss58": wallet.hotkey.ss58_address,
+                "hotkey_ss58": wallet.hotkeypub.ss58_address,
                 "coldkey_ss58": wallet.coldkeypub.ss58_address,
             }
         except Exception as e:
@@ -455,7 +505,7 @@ async def wallet_create(
                 "name": wallet.name,
                 "path": wallet.path,
                 "hotkey": wallet.hotkey_str,
-                "hotkey_ss58": wallet.hotkey.ss58_address,
+                "hotkey_ss58": wallet.hotkeypub.ss58_address,
             }
         except KeyFileError as error:
             err = str(error)
@@ -794,13 +844,14 @@ async def wallet_list(wallet_path: str, json_output: bool):
             data = f"[bold red]Hotkey[/bold red][green] {hkey}[/green] (?)"
             hk_data = {"name": hkey.name, "ss58_address": "?"}
             if hkey:
+                hkey_ss58 = get_hotkey_pub_ss58(hkey)
                 try:
                     data = (
                         f"[bold red]Hotkey[/bold red] [green]{hkey.hotkey_str}[/green]  "
-                        f"ss58_address [green]{hkey.hotkey.ss58_address}[/green]\n"
+                        f"ss58_address [green]{hkey_ss58}[/green]\n"
                     )
                     hk_data["name"] = hkey.hotkey_str
-                    hk_data["ss58_address"] = hkey.hotkey.ss58_address
+                    hk_data["ss58_address"] = hkey_ss58
                 except UnicodeDecodeError:
                     pass
             wallet_tree.add(data)
@@ -1253,7 +1304,7 @@ def _get_hotkeys(
 
     def is_hotkey_matched(wallet: Wallet, item: str) -> bool:
         if is_valid_ss58_address(item):
-            return wallet.hotkey.ss58_address == item
+            return get_hotkey_pub_ss58(wallet) == item
         else:
             return wallet.hotkey_str == item
 
@@ -1285,9 +1336,10 @@ def _get_key_address(all_hotkeys: list[Wallet]) -> tuple[list[str], dict[str, Wa
     hotkey_coldkey_to_hotkey_wallet = {}
     for hotkey_wallet in all_hotkeys:
         if hotkey_wallet.coldkeypub:
-            if hotkey_wallet.hotkey.ss58_address not in hotkey_coldkey_to_hotkey_wallet:
-                hotkey_coldkey_to_hotkey_wallet[hotkey_wallet.hotkey.ss58_address] = {}
-            hotkey_coldkey_to_hotkey_wallet[hotkey_wallet.hotkey.ss58_address][
+            hotkey_ss58 = get_hotkey_pub_ss58(hotkey_wallet)
+            if hotkey_ss58 not in hotkey_coldkey_to_hotkey_wallet:
+                hotkey_coldkey_to_hotkey_wallet[hotkey_ss58] = {}
+            hotkey_coldkey_to_hotkey_wallet[hotkey_ss58][
                 hotkey_wallet.coldkeypub.ss58_address
             ] = hotkey_wallet
         else:
@@ -1471,7 +1523,7 @@ async def inspect(
                     if hotkey_names := [
                         w.hotkey_str
                         for w in hotkeys
-                        if w.hotkey.ss58_address == n.hotkey
+                        if get_hotkey_pub_ss58(w) == n.hotkey
                     ]:
                         hotkey_name = f"{hotkey_names[0]}-"
                     yield [""] * 5 + [

bittensor_cli/src/commands/weights.py

@@ -15,6 +15,7 @@ from bittensor_cli.src.bittensor.utils import (
     console,
     format_error_message,
     json_console,
+    get_hotkey_pub_ss58,
 )
 from bittensor_cli.src.bittensor.extrinsics.root import (
     convert_weights_and_uids_for_emit,
@@ -128,7 +129,7 @@ class SetWeightsExtrinsic:
 
         # Generate the hash of the weights
         commit_hash = generate_weight_hash(
-            address=self.wallet.hotkey.ss58_address,
+            address=get_hotkey_pub_ss58(self.wallet),
             netuid=self.netuid,
             uids=uids,
             values=weights,

{bittensor_cli-9.9.0.dist-info → bittensor_cli-9.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bittensor-cli
-Version: 9.9.0
+Version: 9.10.0
 Summary: Bittensor CLI
 Author: bittensor.com
 Project-URL: homepage, https://github.com/opentensor/btcli
@@ -11,7 +11,6 @@ Requires-Dist: wheel
 Requires-Dist: async-substrate-interface>=1.4.2
 Requires-Dist: aiohttp~=3.10.2
 Requires-Dist: backoff~=2.2.1
-Requires-Dist: click<8.2.0
 Requires-Dist: GitPython>=3.0.0
 Requires-Dist: netaddr~=1.3.0
 Requires-Dist: numpy<3.0.0,>=2.0.1
@@ -20,8 +19,9 @@ Requires-Dist: pycryptodome<4.0.0,>=3.0.0
 Requires-Dist: PyYAML~=6.0.1
 Requires-Dist: rich<15.0,>=13.7
 Requires-Dist: scalecodec==1.2.11
-Requires-Dist: typer<0.16,>=0.12
-Requires-Dist: bittensor-wallet>=3.0.7
+Requires-Dist: typer>=0.16
+Requires-Dist: bittensor-wallet>=4.0.0
+Requires-Dist: packaging
 Requires-Dist: plotille>=5.0.0
 Requires-Dist: plotly>=6.0.0
 Provides-Extra: cuda
@@ -71,7 +71,15 @@ Installation steps are described below. For a full documentation on how to use `
 
 ## Install on macOS and Linux
 
-You can install `btcli` on your local machine directly from source, PyPI, or Homebrew. **Make sure you verify your installation after you install**:
+You can install `btcli` on your local machine directly from source, PyPI, or Homebrew. 
+**Make sure you verify your installation after you install**.
+
+### For macOS users
+Note that the macOS preinstalled CPython installation is compiled with LibreSSL instead of OpenSSL. There are a number
+of issues with LibreSSL, and as such is not fully supported by the libraries used by btcli. Thus we highly recommend, if 
+you are using a Mac, to first install Python from [Homebrew](https://brew.sh/). Additionally, the Rust FFI bindings 
+[if installing from precompiled wheels (default)] require the Homebrew-installed OpenSSL pacakge. If you choose to use
+the preinstalled Python version from macOS, things may not work completely.
 
 
 ### Install from [PyPI](https://pypi.org/project/bittensor/)

{bittensor_cli-9.9.0.dist-info → bittensor_cli-9.10.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 bittensor_cli/__init__.py,sha256=Lpv4NkbAQgwrfqFOnTMuR_S-fqGdaWCSLhxnFnGTHM0,1232
-bittensor_cli/cli.py,sha256=lG3LyOXXiOOEIPgiW9qnqmKnH2wa598iJ6pf-eNCveg,234995
+bittensor_cli/cli.py,sha256=98G_j7HE6IM3breC6kOsEl6zvVXxrrwDFSEk1pEAxbg,240109
 bittensor_cli/doc_generation_helper.py,sha256=GexqjEIKulWg84hpNBEchJ840oOgOi7DWpt447nsdNI,91
 bittensor_cli/version.py,sha256=dU1xsa3mG5FPdhzvqlzDByNcCHmzcFQH3q1pQr4u76g,720
 bittensor_cli/src/__init__.py,sha256=QCR6kt9rbUiLC4gkvczl47eg725nqSFK4Xr7_mz3e_s,33171
@@ -8,12 +8,12 @@ bittensor_cli/src/bittensor/balances.py,sha256=q5KkxF8wmUguWAFddEKstfDKTxPe5ISHp
 bittensor_cli/src/bittensor/chain_data.py,sha256=_GATOCacWMN2jRurzn3hffJiq_l7AznGRkKePTAflwQ,44420
 bittensor_cli/src/bittensor/minigraph.py,sha256=BIzmSVLfBYiRAeGD_i1LAC8Cw7zxp38a91SIFEPMqYc,10479
 bittensor_cli/src/bittensor/networking.py,sha256=pZLMs8YXpZzDMLXWMBb_Bj6TVkm_q9khyY-lnbwVMuE,462
-bittensor_cli/src/bittensor/subtensor_interface.py,sha256=37BB5dfcRE6QrAKwuYs9XlaLs36xHrhJ3wCsWd-rXek,62672
-bittensor_cli/src/bittensor/utils.py,sha256=WfxxQnekVy7nbB2jsPrRC4E7SFIvAjDJJjq3glhKMSc,48270
+bittensor_cli/src/bittensor/subtensor_interface.py,sha256=9XJ74DTOLHoV5qQNmkhuvbl2kiaar4p1SV7GJeZY5p8,62698
+bittensor_cli/src/bittensor/utils.py,sha256=DsBVb2WZ6baviYg0t9FfVZp8sn5C-h_Khbm4akxx1gg,48657
 bittensor_cli/src/bittensor/extrinsics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bittensor_cli/src/bittensor/extrinsics/registration.py,sha256=7ybqpJ7-Z_PTgj4boCOFxgfjMBCHv0JE7MNpJzJmyDc,66360
-bittensor_cli/src/bittensor/extrinsics/root.py,sha256=C9WPssL2HpNK8u_IFPPr8TrdFgbLPTfkbAYzalfmbRM,19188
-bittensor_cli/src/bittensor/extrinsics/transfer.py,sha256=S4HFvgwhUk-NQ26FOkg8m1ggAJ50jgPsW_isdAdS_rc,9235
+bittensor_cli/src/bittensor/extrinsics/registration.py,sha256=Q43L-d_Ayp7saWWCPR4hShBDpzjh5bfsqtatiiiM2Zk,66199
+bittensor_cli/src/bittensor/extrinsics/root.py,sha256=tOG-xSO0ihC--AhPwrhLkm1nduvHbFAObeONGSHUdJw,19218
+bittensor_cli/src/bittensor/extrinsics/transfer.py,sha256=Dry4DZ5lSlJdrD0Y-W-8B4WMsN1oag0Kzm_GP8Nt9E8,9276
 bittensor_cli/src/bittensor/templates/main-filters.j2,sha256=ZM0l2exr6FKqw86GRyHHtw-h8Y5Ckgx-SPc-48gZoxI,914
 bittensor_cli/src/bittensor/templates/main-header.j2,sha256=aZwB9NeEjNr0pM5mPYTYeky_031zAu6yErIMiwTPcwE,1684
 bittensor_cli/src/bittensor/templates/neuron-details.j2,sha256=O_Mhg2E04BzW_cSGIldObhVTSRX29gDNqnimW4ty9rY,4848
@@ -28,24 +28,24 @@ bittensor_cli/src/bittensor/templates/view.css,sha256=OS0V_ixzdTU15FbNzpZW1m7-c6
 bittensor_cli/src/bittensor/templates/view.j2,sha256=4ux3uyqz34v9VVAX17GezuPESk4z9n5kkd9HbnTsF_Y,1101
 bittensor_cli/src/bittensor/templates/view.js,sha256=QIPnPp9SuYS9wcl7cwL8nFzd8idiDjNzrDjwwxpiVvY,45076
 bittensor_cli/src/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bittensor_cli/src/commands/sudo.py,sha256=zyv4sJM7sH73_c-mgskcnF2kQfJBJ8_xF74WrZFv7rY,33820
+bittensor_cli/src/commands/sudo.py,sha256=Ut4jD8mSRMT0dF0Xgoqr5_I3eW_1TnmOhFZ2zQNzWwU,33874
 bittensor_cli/src/commands/view.py,sha256=9lx6vfOkel8KIefUhDNaBS_j5lNR2djcRFRbK4mbnDE,12535
-bittensor_cli/src/commands/wallets.py,sha256=SIcEf7AkxonUAM3zYEaQUJTczCIY6iFtR3sTunhB1C8,74745
-bittensor_cli/src/commands/weights.py,sha256=BCJm_mlw0pVK4YEZuEMqQBpvvOoB7B1rzdvMeN3uTfM,16503
+bittensor_cli/src/commands/wallets.py,sha256=aQs9XHFeL9_oW3gHwP3tmG6dCx8IiQH0npO5Gggsgc0,76668
+bittensor_cli/src/commands/weights.py,sha256=iZMiZM3Y_WbglJdbN6QrRHnJ0AtlCOGmSJlXTIcOa3E,16529
 bittensor_cli/src/commands/liquidity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bittensor_cli/src/commands/liquidity/liquidity.py,sha256=AXCjBvQb2gakP8n1z81npYkZ_QF5CQy7r82AMtQwXzk,21692
 bittensor_cli/src/commands/liquidity/utils.py,sha256=egfZHnvBMc8ydntAHnU6V5Zyi-wLkomjNuucUj73aZQ,6361
 bittensor_cli/src/commands/stake/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bittensor_cli/src/commands/stake/add.py,sha256=jdNOilpEsq8f7vJUQH1qFdiQ-HbSg6siYQl_CQdtlh0,29731
-bittensor_cli/src/commands/stake/children_hotkeys.py,sha256=lMiV-Z3SGZUEapdy0LRthFLx0RlFK0KVxytE47ybdEc,31746
+bittensor_cli/src/commands/stake/add.py,sha256=9FFC0g2NDKm3Uheh4LFvqNvz17mhXpwWFRG2gyXjc7w,29759
+bittensor_cli/src/commands/stake/children_hotkeys.py,sha256=1xR1FTljjaWD_-uTopVUkM88jNaz7vWuOwydG202lLQ,31736
 bittensor_cli/src/commands/stake/list.py,sha256=tzjhiJucXgOGaw7TGt420nGosH85AEjvOimP1XXV3Xs,29038
-bittensor_cli/src/commands/stake/move.py,sha256=RJiY_oSQUV-ZO04Y_PosrDqfz0JfdQX4ioB74f_7lU8,35144
-bittensor_cli/src/commands/stake/remove.py,sha256=Xf_BWihl--4WGKPl6Wz4VkWus3JKEikHQKA0tbQTetM,51318
+bittensor_cli/src/commands/stake/move.py,sha256=TqUBqYEhfDu77l8BUdZYNy1MVybcizmtUTaPPFIAvbk,35171
+bittensor_cli/src/commands/stake/remove.py,sha256=ANrH9VyCJqddnabXU1EbdUxh0bpwZzz3BH58MCvKqA4,51347
 bittensor_cli/src/commands/subnets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bittensor_cli/src/commands/subnets/price.py,sha256=akXkbilWjQYqTYvtOhXngX_cVkU0Mv-Gl3kjce6dtl0,21490
-bittensor_cli/src/commands/subnets/subnets.py,sha256=ZeR7gxjtxi9eQdPLlIOmw3jDxDPnteppTPJ1-1y_TCs,94601
-bittensor_cli-9.9.0.dist-info/METADATA,sha256=3KHTWo7iaqwIrHfos259k3CbxZI9MBy_OwGxAZSf2rI,6601
-bittensor_cli-9.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bittensor_cli-9.9.0.dist-info/entry_points.txt,sha256=hBTLGLbVxmAKy69XSKaUZvjTCmyEzDGZKq4S8UOto8I,49
-bittensor_cli-9.9.0.dist-info/top_level.txt,sha256=DvgvXpmTtI_Q1BbDZMlK90LFcGFCreN1daViEPV2iFw,14
-bittensor_cli-9.9.0.dist-info/RECORD,,
+bittensor_cli/src/commands/subnets/price.py,sha256=RzcFVqFnQV5zBekyZCMrqpydh88yWlMLm5VJNUNfQCU,25814
+bittensor_cli/src/commands/subnets/subnets.py,sha256=ROtNBTUuoQcinIO5l55ky28JPd1PI4IqybdIc9JTjr0,94628
+bittensor_cli-9.10.0.dist-info/METADATA,sha256=Ws21m1MXBECp1IEizYL66YoemCnMzNqlNk133RC4_4Q,7169
+bittensor_cli-9.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bittensor_cli-9.10.0.dist-info/entry_points.txt,sha256=hBTLGLbVxmAKy69XSKaUZvjTCmyEzDGZKq4S8UOto8I,49
+bittensor_cli-9.10.0.dist-info/top_level.txt,sha256=DvgvXpmTtI_Q1BbDZMlK90LFcGFCreN1daViEPV2iFw,14
+bittensor_cli-9.10.0.dist-info/RECORD,,