bittensor-cli 8.4.2__py3-none-any.whl → 8.4.4__py3-none-any.whl

bittensor_cli/__init__.py

@@ -18,6 +18,6 @@
 from .cli import CLIManager
 
 
-__version__ = "8.4.2"
+__version__ = "8.4.4"
 
 __all__ = ["CLIManager", "__version__"]

bittensor_cli/cli.py

@@ -58,7 +58,7 @@ except ImportError:
         pass
 
 
-__version__ = "8.4.2"
+__version__ = "8.4.4"
 
 
 _core_version = re.match(r"^\d+\.\d+\.\d+", __version__).group(0)
@@ -132,15 +132,10 @@ class Options:
     ss58_address = typer.Option(
         None, "--ss58", "--ss58-address", help="The SS58 address of the coldkey."
     )
-    overwrite_coldkey = typer.Option(
+    overwrite = typer.Option(
         False,
-        help="Overwrite the old coldkey with the newly generated coldkey.",
-        prompt=True,
-    )
-    overwrite_hotkey = typer.Option(
-        False,
-        help="Overwrite the old hotkey with the newly generated hotkey.",
-        prompt=True,
+        "--overwrite/--no-overwrite",
+        help="Overwrite the existing wallet file with the new one.",
     )
     network = typer.Option(
         None,
@@ -1725,6 +1720,7 @@ class CLIManager:
         json: Optional[str] = Options.json,
         json_password: Optional[str] = Options.json_password,
         use_password: Optional[bool] = Options.use_password,
+        overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
     ):
@@ -1770,6 +1766,7 @@ class CLIManager:
                 json,
                 json_password,
                 use_password,
+                overwrite,
             )
         )
 
@@ -1780,6 +1777,7 @@ class CLIManager:
         wallet_hotkey: Optional[str] = Options.wallet_hotkey,
         public_key_hex: Optional[str] = Options.public_hex_key,
         ss58_address: Optional[str] = Options.ss58_address,
+        overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
     ):
@@ -1826,7 +1824,7 @@ class CLIManager:
             rich.print("[red]Error: Invalid SS58 address or public key![/red]")
             raise typer.Exit()
         return self._run_command(
-            wallets.regen_coldkey_pub(wallet, ss58_address, public_key_hex)
+            wallets.regen_coldkey_pub(wallet, ss58_address, public_key_hex, overwrite)
         )
 
     def wallet_regen_hotkey(
@@ -1842,6 +1840,7 @@ class CLIManager:
             False,  # Overriden to False
             help="Set to 'True' to protect the generated Bittensor key with a password.",
         ),
+        overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
     ):
@@ -1880,6 +1879,7 @@ class CLIManager:
                 json,
                 json_password,
                 use_password,
+                overwrite,
             )
         )
 
@@ -1898,6 +1898,7 @@ class CLIManager:
             False,  # Overriden to False
             help="Set to 'True' to protect the generated Bittensor key with a password.",
         ),
+        overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
     ):
@@ -1935,7 +1936,9 @@ class CLIManager:
             validate=WV.WALLET,
         )
         n_words = get_n_words(n_words)
-        return self._run_command(wallets.new_hotkey(wallet, n_words, use_password))
+        return self._run_command(
+            wallets.new_hotkey(wallet, n_words, use_password, overwrite)
+        )
 
     def wallet_new_coldkey(
         self,
@@ -1949,6 +1952,7 @@ class CLIManager:
             help="The number of words used in the mnemonic. Options: [12, 15, 18, 21, 24]",
         ),
         use_password: Optional[bool] = Options.use_password,
+        overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
     ):
@@ -1985,7 +1989,9 @@ class CLIManager:
             validate=WV.NONE,
         )
         n_words = get_n_words(n_words)
-        return self._run_command(wallets.new_coldkey(wallet, n_words, use_password))
+        return self._run_command(
+            wallets.new_coldkey(wallet, n_words, use_password, overwrite)
+        )
 
     def wallet_check_ck_swap(
         self,
@@ -2019,6 +2025,7 @@ class CLIManager:
         wallet_hotkey: Optional[str] = Options.wallet_hotkey,
         n_words: Optional[int] = None,
         use_password: bool = Options.use_password,
+        overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
     ):
@@ -2064,6 +2071,7 @@ class CLIManager:
                 wallet,
                 n_words,
                 use_password,
+                overwrite,
             )
         )
 
@@ -2345,8 +2353,8 @@ class CLIManager:
                 twitter_url,
                 info_,
                 validator_id,
-                prompt,
                 subnet_netuid,
+                prompt,
             )
         )
 
@@ -2790,7 +2798,9 @@ class CLIManager:
         [green]$[/green] btcli root proposals
         """
         self.verbosity_handler(quiet, verbose)
-        return self._run_command(root.proposals(self.initialize_chain(network)))
+        return self._run_command(
+            root.proposals(self.initialize_chain(network), verbose)
+        )
 
     def root_set_take(
         self,

bittensor_cli/src/bittensor/utils.py

@@ -1010,3 +1010,32 @@ def hex_to_bytes(hex_str: str) -> bytes:
     else:
         bytes_result = bytes.fromhex(hex_str)
     return bytes_result
+
+
+def blocks_to_duration(blocks: int) -> str:
+    """Convert blocks to human readable duration string using two largest units.
+
+    Args:
+        blocks (int): Number of blocks (12s per block)
+
+    Returns:
+        str: Duration string like '2d 5h', '3h 45m', '2m 10s', or '0s'
+    """
+    if blocks <= 0:
+        return "0s"
+
+    seconds = blocks * 12
+    intervals = [
+        ("d", 86400),  # 60 * 60 * 24
+        ("h", 3600),  # 60 * 60
+        ("m", 60),
+        ("s", 1),
+    ]
+    results = []
+    for unit, seconds_per_unit in intervals:
+        unit_count = seconds // seconds_per_unit
+        seconds %= seconds_per_unit
+        if unit_count > 0:
+            results.append(f"{unit_count}{unit}")
+    # Return only the first two non-zero units
+    return " ".join(results[:2]) or "0s"

bittensor_cli/src/commands/root.py

@@ -42,6 +42,7 @@ from bittensor_cli.src.bittensor.utils import (
     update_metadata_table,
     group_subnets,
     unlock_key,
+    blocks_to_duration,
 )
 
 if TYPE_CHECKING:
@@ -82,14 +83,22 @@ def format_call_data(call_data: dict) -> str:
     call_info = call_details[0]
     call_function, call_args = next(iter(call_info.items()))
 
-    # Extract the argument, handling tuple values
-    formatted_args = ", ".join(
-        str(arg[0]) if isinstance(arg, tuple) else str(arg)
-        for arg in call_args.values()
-    )
+    # Format arguments, handle nested/large payloads
+    formatted_args = []
+    for arg_name, arg_value in call_args.items():
+        if isinstance(arg_value, (tuple, list, dict)):
+            # For large nested, show abbreviated version
+            content_str = str(arg_value)
+            if len(content_str) > 20:
+                formatted_args.append(f"{arg_name}: ... [{len(content_str)}] ...")
+            else:
+                formatted_args.append(f"{arg_name}: {arg_value}")
+        else:
+            formatted_args.append(f"{arg_name}: {arg_value}")
 
     # Format the final output string
-    return f"{call_function}({formatted_args})"
+    args_str = ", ".join(formatted_args)
+    return f"{module}.{call_function}({args_str})"
 
 
 async def _get_senate_members(
@@ -1210,24 +1219,30 @@ async def register(wallet: Wallet, subtensor: SubtensorInterface, prompt: bool):
     )
 
 
-async def proposals(subtensor: SubtensorInterface):
+async def proposals(subtensor: SubtensorInterface, verbose: bool):
     console.print(
         ":satellite: Syncing with chain: [white]{}[/white] ...".format(
             subtensor.network
         )
     )
-    print_verbose("Fetching senate members & proposals")
     block_hash = await subtensor.substrate.get_chain_head()
-    senate_members, all_proposals = await asyncio.gather(
+    senate_members, all_proposals, current_block = await asyncio.gather(
         _get_senate_members(subtensor, block_hash),
         _get_proposals(subtensor, block_hash),
+        subtensor.substrate.get_block_number(block_hash),
     )
 
-    print_verbose("Fetching member information from Chain")
     registered_delegate_info: dict[
         str, DelegatesDetails
     ] = await subtensor.get_delegate_identities()
 
+    title = (
+        f"[bold #4196D6]Bittensor Governance Proposals[/bold #4196D6]\n"
+        f"[steel_blue3]Current Block:[/steel_blue3] {current_block}\t"
+        f"[steel_blue3]Network:[/steel_blue3] {subtensor.network}\n\n"
+        f"[steel_blue3]Active Proposals:[/steel_blue3] {len(all_proposals)}\t"
+        f"[steel_blue3]Senate Size:[/steel_blue3] {len(senate_members)}\n"
+    )
     table = Table(
         Column(
             "[white]HASH",
@@ -1242,8 +1257,8 @@ async def proposals(subtensor: SubtensorInterface):
             style="rgb(50,163,219)",
         ),
         Column("[white]END", style="bright_cyan"),
-        Column("[white]CALLDATA", style="dark_sea_green"),
-        title=f"\n[dark_orange]Proposals\t\t\nActive Proposals: {len(all_proposals)}\t\tSenate Size: {len(senate_members)}\nNetwork: {subtensor.network}",
+        Column("[white]CALLDATA", style="dark_sea_green", width=30),
+        title=title,
         show_footer=True,
         box=box.SIMPLE_HEAVY,
         pad_edge=False,
@@ -1251,16 +1266,36 @@ async def proposals(subtensor: SubtensorInterface):
         border_style="bright_black",
     )
     for hash_, (call_data, vote_data) in all_proposals.items():
+        blocks_remaining = vote_data.end - current_block
+        if blocks_remaining > 0:
+            duration_str = blocks_to_duration(blocks_remaining)
+            vote_end_cell = f"{vote_data.end} [dim](in {duration_str})[/dim]"
+        else:
+            vote_end_cell = f"{vote_data.end} [red](expired)[/red]"
+
+        ayes_threshold = (
+            (len(vote_data.ayes) / vote_data.threshold * 100)
+            if vote_data.threshold > 0
+            else 0
+        )
+        nays_threshold = (
+            (len(vote_data.nays) / vote_data.threshold * 100)
+            if vote_data.threshold > 0
+            else 0
+        )
         table.add_row(
-            hash_,
+            hash_ if verbose else f"{hash_[:4]}...{hash_[-4:]}",
             str(vote_data.threshold),
-            str(len(vote_data.ayes)),
-            str(len(vote_data.nays)),
+            f"{len(vote_data.ayes)} ({ayes_threshold:.2f}%)",
+            f"{len(vote_data.nays)} ({nays_threshold:.2f}%)",
             display_votes(vote_data, registered_delegate_info),
-            str(vote_data.end),
+            vote_end_cell,
             format_call_data(call_data),
         )
-    return console.print(table)
+    console.print(table)
+    console.print(
+        "\n[dim]* Both Ayes and Nays percentages are calculated relative to the proposal's threshold.[/dim]"
+    )
 
 
 async def set_take(wallet: Wallet, subtensor: SubtensorInterface, take: float) -> bool:

bittensor_cli/src/commands/stake/children_hotkeys.py

@@ -299,11 +299,7 @@ async def get_children(
             params=[hotkey],
             reuse_block_hash=True,
         )
-        stake = (
-            Balance.from_rao(_result)
-            if _result is not None
-            else Balance(0)
-        )
+        stake = Balance.from_rao(_result) if _result is not None else Balance(0)
         if parent:
             console.print(
                 f"\nYour Hotkey: [bright_magenta]{hotkey}[/bright_magenta]  |  Total Stake: [dark_orange]{stake}t[/dark_orange]\n",

bittensor_cli/src/commands/wallets.py

@@ -69,6 +69,7 @@ async def regen_coldkey(
     json_path: Optional[str] = None,
     json_password: Optional[str] = "",
     use_password: Optional[bool] = True,
+    overwrite: Optional[bool] = False,
 ):
     """Creates a new coldkey under this wallet"""
     json_str: Optional[str] = None
@@ -83,7 +84,7 @@ async def regen_coldkey(
             seed=seed,
             json=(json_str, json_password) if all([json_str, json_password]) else None,
             use_password=use_password,
-            overwrite=False,
+            overwrite=overwrite,
         )
 
         if isinstance(new_wallet, Wallet):
@@ -101,13 +102,14 @@ async def regen_coldkey_pub(
     wallet: Wallet,
     ss58_address: str,
     public_key_hex: str,
+    overwrite: Optional[bool] = False,
 ):
     """Creates a new coldkeypub under this wallet."""
     try:
         new_coldkeypub = wallet.regenerate_coldkeypub(
             ss58_address=ss58_address,
             public_key=public_key_hex,
-            overwrite=False,
+            overwrite=overwrite,
         )
         if isinstance(new_coldkeypub, Wallet):
             console.print(
@@ -125,6 +127,7 @@ async def regen_hotkey(
     json_path: Optional[str],
     json_password: Optional[str] = "",
     use_password: Optional[bool] = False,
+    overwrite: Optional[bool] = False,
 ):
     """Creates a new hotkey under this wallet."""
     json_str: Optional[str] = None
@@ -141,7 +144,7 @@ async def regen_hotkey(
             seed=seed,
             json=(json_str, json_password) if all([json_str, json_password]) else None,
             use_password=use_password,
-            overwrite=False,
+            overwrite=overwrite,
         )
         if isinstance(new_hotkey, Wallet):
             console.print(
@@ -158,13 +161,14 @@ async def new_hotkey(
     wallet: Wallet,
     n_words: int,
     use_password: bool,
+    overwrite: Optional[bool] = False,
 ):
     """Creates a new hotkey under this wallet."""
     try:
         wallet.create_new_hotkey(
             n_words=n_words,
             use_password=use_password,
-            overwrite=False,
+            overwrite=overwrite,
         )
     except KeyFileError:
         print_error("KeyFileError: File is not writable")
@@ -174,13 +178,14 @@ async def new_coldkey(
     wallet: Wallet,
     n_words: int,
     use_password: bool,
+    overwrite: Optional[bool] = False,
 ):
     """Creates a new coldkey under this wallet."""
     try:
         wallet.create_new_coldkey(
             n_words=n_words,
             use_password=use_password,
-            overwrite=False,
+            overwrite=overwrite,
         )
     except KeyFileError:
         print_error("KeyFileError: File is not writable")
@@ -190,13 +195,14 @@ async def wallet_create(
     wallet: Wallet,
     n_words: int = 12,
     use_password: bool = True,
+    overwrite: Optional[bool] = False,
 ):
     """Creates a new wallet."""
     try:
         wallet.create_new_coldkey(
             n_words=n_words,
             use_password=use_password,
-            overwrite=False,
+            overwrite=overwrite,
         )
     except KeyFileError:
         print_error("KeyFileError: File is not writable")
@@ -205,7 +211,7 @@ async def wallet_create(
         wallet.create_new_hotkey(
             n_words=n_words,
             use_password=False,
-            overwrite=False,
+            overwrite=overwrite,
         )
     except KeyFileError:
         print_error("KeyFileError: File is not writable")

{bittensor_cli-8.4.2.dist-info → bittensor_cli-8.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bittensor-cli
-Version: 8.4.2
+Version: 8.4.4
 Summary: Bittensor CLI
 Home-page: https://github.com/opentensor/btcli
 Author: bittensor.com
@@ -41,7 +41,7 @@ Requires-Dist: scalecodec==1.2.11
 Requires-Dist: substrate-interface~=1.7.9
 Requires-Dist: typer~=0.12
 Requires-Dist: websockets>=14.1
-Requires-Dist: bittensor-wallet>=2.1.3
+Requires-Dist: bittensor-wallet>=3.0.0
 Requires-Dist: bt-decode==0.4.0
 Provides-Extra: cuda
 Requires-Dist: cubit>=1.1.0; extra == "cuda"

{bittensor_cli-8.4.2.dist-info → bittensor_cli-8.4.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
-bittensor_cli/__init__.py,sha256=8MlFrDic7lbKUDE8550S3EM88o0lda03g6Cv4Lxe1Gc,1217
-bittensor_cli/cli.py,sha256=pzWwiuiHGBOeZGZ72DQOrXKKVfPcP8MkHZR7L6keZXw,170143
+bittensor_cli/__init__.py,sha256=Lv2RXak408x-iJTQ2h6fQrO4dHaSiy0KNbH9-uNj24k,1217
+bittensor_cli/cli.py,sha256=3yQEQjMZKqfH4uhf747UWzL4EOHXdJT6AAXufTaMm_4,170451
 bittensor_cli/doc_generation_helper.py,sha256=GexqjEIKulWg84hpNBEchJ840oOgOi7DWpt447nsdNI,91
 bittensor_cli/src/__init__.py,sha256=LpTjd5p40H08K4IbyJCNdLJhEcb8NuWXOwl5kSNYwjI,12355
 bittensor_cli/src/bittensor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -9,23 +9,23 @@ bittensor_cli/src/bittensor/chain_data.py,sha256=IsHWjmhJbTvud2i3IM1sfmBHP82VxNH
 bittensor_cli/src/bittensor/minigraph.py,sha256=17AjEA75MO7ez_NekOJSaAz6ARjPt99QG_7E1RJ_u_k,8891
 bittensor_cli/src/bittensor/networking.py,sha256=pZLMs8YXpZzDMLXWMBb_Bj6TVkm_q9khyY-lnbwVMuE,462
 bittensor_cli/src/bittensor/subtensor_interface.py,sha256=JPlA39oHf1k3ltrgDKeiAnBqF51oJnn-s3EO5y1WbAY,42669
-bittensor_cli/src/bittensor/utils.py,sha256=cQK2tU06OYAbedqVi3M9Nw6S2DujyyO7qHB-uAVkmDE,34686
+bittensor_cli/src/bittensor/utils.py,sha256=WiQPe3cSmqQmrxrQ2IE1v2iw9-mNaia7pPunC8RB_PI,35482
 bittensor_cli/src/bittensor/extrinsics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bittensor_cli/src/bittensor/extrinsics/registration.py,sha256=Ieh8Wo9u7km0A_1FhEdKluozcFZB0VCs1sFEQc0faQA,58851
 bittensor_cli/src/bittensor/extrinsics/root.py,sha256=hajvQOA3GyBsFKu7ifa69096dSP6NwBXmKm8HKLRVzs,19079
 bittensor_cli/src/bittensor/extrinsics/transfer.py,sha256=I0XXmLI8rTxb4kUqws0J-PPcdg38TeV8AeyIVQT-TOU,8644
 bittensor_cli/src/bittensor/templates/table.j2,sha256=P2EFiksnO1cQsB8zjK6hVJwUryHTsLslzRE0YtobAV8,10601
 bittensor_cli/src/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bittensor_cli/src/commands/root.py,sha256=28mHTMkZe0X-62Sg6o9dG82m1bx5IAG9eXk9ZBr3Jjo,62256
+bittensor_cli/src/commands/root.py,sha256=SCniGHwKTHNH1hQgHcXiM34v07KdJjpeB9YCRBrL1tw,63780
 bittensor_cli/src/commands/subnets.py,sha256=riR41_ajUVWlDoaTUQahPzZswtY2h72pMK0rNuPj2SM,33164
 bittensor_cli/src/commands/sudo.py,sha256=bP9t0QpXmqHnscEvCFHgJ4a7vETyqG1Kuc2CIVQ5qus,8436
-bittensor_cli/src/commands/wallets.py,sha256=BuPJiEDOpHuGRx3zekU2QkFQjFpCUP-Kdk4opS5YfWo,60678
+bittensor_cli/src/commands/wallets.py,sha256=V6Vcnt7Q3tFi02ugeIPIPF8BaraDwiIkHT3oZ-wfF7Q,60940
 bittensor_cli/src/commands/weights.py,sha256=XHn0MLYUcEUtOkA_soIBJ5rqkpIliUVnyc4nzdPQslw,16276
 bittensor_cli/src/commands/stake/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bittensor_cli/src/commands/stake/children_hotkeys.py,sha256=tpYr6bdit5YiOqTyBhqJIRgBX6phVw3eWvzYLrpRWeM,28518
+bittensor_cli/src/commands/stake/children_hotkeys.py,sha256=hu7ObsUkg6j6_1Bylqe3oBajV9gQmr6QlggXYTWwgjQ,28470
 bittensor_cli/src/commands/stake/stake.py,sha256=7TyFtL5wnXvGvD-GckNrNTRdcu3RewAfx_JfEekugFU,56147
-bittensor_cli-8.4.2.dist-info/METADATA,sha256=plJ0n3g3G91Ta54cbama_ukynqCbeedSmqWsqogLqes,6786
-bittensor_cli-8.4.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-bittensor_cli-8.4.2.dist-info/entry_points.txt,sha256=hBTLGLbVxmAKy69XSKaUZvjTCmyEzDGZKq4S8UOto8I,49
-bittensor_cli-8.4.2.dist-info/top_level.txt,sha256=DvgvXpmTtI_Q1BbDZMlK90LFcGFCreN1daViEPV2iFw,14
-bittensor_cli-8.4.2.dist-info/RECORD,,
+bittensor_cli-8.4.4.dist-info/METADATA,sha256=0Fzbs6Yt2PKxuqo7T1qU3OFHRZVlsiEOx-cJZKpf9jY,6786
+bittensor_cli-8.4.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+bittensor_cli-8.4.4.dist-info/entry_points.txt,sha256=hBTLGLbVxmAKy69XSKaUZvjTCmyEzDGZKq4S8UOto8I,49
+bittensor_cli-8.4.4.dist-info/top_level.txt,sha256=DvgvXpmTtI_Q1BbDZMlK90LFcGFCreN1daViEPV2iFw,14
+bittensor_cli-8.4.4.dist-info/RECORD,,