bittensor-cli 8.2.0rc14__py3-none-any.whl → 8.2.0rc15__py3-none-any.whl

bittensor_cli/__init__.py

@@ -18,6 +18,6 @@
 from .cli import CLIManager
 
 
-__version__ = "8.2.0rc14"
+__version__ = "8.2.0rc15"
 
 __all__ = ["CLIManager", "__version__"]

bittensor_cli/cli.py

@@ -64,7 +64,7 @@ except ImportError:
         pass
 
 
-__version__ = "8.2.0rc14"
+__version__ = "8.2.0rc15"
 
 
 _core_version = re.match(r"^\d+\.\d+\.\d+", __version__).group(0)
@@ -2478,6 +2478,7 @@ class CLIManager:
         live: bool = Options.live,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        no_prompt: bool = Options.prompt,
         # TODO add: all-wallets, reuse_last, html_output
     ):
         """List all stake accounts for wallet."""
@@ -2506,7 +2507,7 @@ class CLIManager:
 
         return self._run_command(
             stake.stake_list(
-                wallet, coldkey_ss58, self.initialize_chain(network), live, verbose
+                wallet, coldkey_ss58, self.initialize_chain(network), live, verbose, no_prompt  
             )
         )
 
@@ -4041,8 +4042,10 @@ class CLIManager:
             wallet_hotkey,
             ask_for=[
                 WO.NAME,
+                WO.HOTKEY,
+                WO.PATH,
             ],
-            validate=WV.WALLET,
+            validate=WV.WALLET_AND_HOTKEY,
         )
         identity = prompt_for_subnet_identity(
             subnet_name=subnet_name,

bittensor_cli/src/bittensor/chain_data.py

@@ -900,6 +900,7 @@ class DynamicInfo:
     pending_root_emission: Balance
     network_registered_at: int
     subnet_identity: Optional[SubnetIdentity]
+    subnet_volume: float
 
     @classmethod
     def from_vec_u8(cls, vec_u8: list[int]) -> Optional["DynamicInfo"]:
@@ -938,6 +939,7 @@ class DynamicInfo:
         alpha_in = Balance.from_rao(decoded["alpha_in"]).set_unit(netuid)
         alpha_out = Balance.from_rao(decoded["alpha_out"]).set_unit(netuid)
         tao_in = Balance.from_rao(decoded["tao_in"]).set_unit(0)
+        subnet_volume = Balance.from_rao(decoded["subnet_volume"]).set_unit(netuid)
         alpha_out_emission = Balance.from_rao(decoded["alpha_out_emission"]).set_unit(
             netuid
         )
@@ -991,6 +993,7 @@ class DynamicInfo:
             pending_root_emission=pending_root_emission,
             network_registered_at=int(decoded["network_registered_at"]),
             subnet_identity=subnet_identity,
+            subnet_volume=subnet_volume,
         )
 
     def tao_to_alpha(self, tao: Balance) -> Balance:
@@ -1601,6 +1604,7 @@ custom_rpc_type_registry = {
                 ["pending_alpha_emission", "Compact<u64>"],
                 ["pending_root_emission", "Compact<u64>"],
                 ["network_registered_at", "Compact<u64>"],
+                ["subnet_volume", "Compact<u128>"],
                 ["subnet_identity", "Option<SubnetIdentity>"],
             ],
         },

bittensor_cli/src/bittensor/subtensor_interface.py

@@ -27,6 +27,7 @@ from bittensor_cli.src.bittensor.chain_data import (
     decode_hex_identity,
     DelegateInfoLite,
     DynamicInfo,
+    SubnetState,
 )
 from bittensor_cli.src import DelegatesDetails
 from bittensor_cli.src.bittensor.balances import Balance, FixedPoint, fixed_to_float
@@ -588,6 +589,36 @@ class SubtensorInterface:
         )
         return result
 
+    async def get_subnet_state(
+        self, netuid: int, block_hash: Optional[str] = None
+    ) -> Optional["SubnetState"]:
+        """
+        Retrieves the state of a specific subnet within the Bittensor network.
+
+        Args:
+            netuid: The network UID of the subnet to query.
+            block_hash: The hash of the blockchain block number for the query.
+
+        Returns:
+            SubnetState object containing the subnet's state information, or None if the subnet doesn't exist.
+        """
+        hex_bytes_result = await self.query_runtime_api(
+            runtime_api="SubnetInfoRuntimeApi",
+            method="get_subnet_state",
+            params=[netuid],
+            block_hash=block_hash,
+        )
+
+        if hex_bytes_result is None:
+            return None
+
+        try:
+            bytes_result = bytes.fromhex(hex_bytes_result[2:])
+        except ValueError:
+            bytes_result = bytes.fromhex(hex_bytes_result)
+
+        return SubnetState.from_vec_u8(bytes_result)
+
     async def get_hyperparameter(
         self,
         param_name: str,

bittensor_cli/src/commands/stake/stake.py

@@ -1185,6 +1185,7 @@ async def stake_list(
     subtensor: "SubtensorInterface",
     live: bool = False,
     verbose: bool = False,
+    prompt: bool = False,
 ):
     coldkey_address = coldkey_ss58 if coldkey_ss58 else wallet.coldkeypub.ss58_address
 
@@ -1217,8 +1218,9 @@ async def stake_list(
         live: bool = False,
     ):
         title = f"\n[{COLOR_PALETTE['GENERAL']['HEADER']}]Hotkey: {hotkey_name}\nNetwork: {subtensor.network}\n\n"
-        if not live:
-            title += f"[{COLOR_PALETTE['GENERAL']['HINT']}]See below for an explanation of the columns\n"
+        # TODO: Add hint back in after adding columns descriptions
+        # if not live:
+        #     title += f"[{COLOR_PALETTE['GENERAL']['HINT']}]See below for an explanation of the columns\n"
         table = Table(
             title=title,
             show_footer=True,
@@ -1729,7 +1731,7 @@ async def stake_list(
             all_hotkeys_total_global_tao += stake
             all_hotkeys_total_tao_value += value
 
-            if num_hotkeys > 1 and counter < num_hotkeys:
+            if num_hotkeys > 1 and counter < num_hotkeys and prompt:
                 console.print("\nPress Enter to continue to the next hotkey...")
                 input()
 

bittensor_cli/src/commands/subnets/subnets.py

@@ -806,24 +806,16 @@ async def show(
             print_error("The root subnet does not exist")
             raise typer.Exit()
 
-        hex_bytes_result, identities, old_identities = await asyncio.gather(
-            subtensor.query_runtime_api(
-                runtime_api="SubnetInfoRuntimeApi",
-                method="get_subnet_state",
-                params=[0],
-            ),
+        root_state, identities, old_identities = await asyncio.gather(
+            subtensor.get_subnet_state(netuid=0),
             subtensor.query_all_identities(),
             subtensor.get_delegate_identities(),
         )
 
-        if (bytes_result := hex_bytes_result) is None:
+        if root_state is None:
             err_console.print("The root subnet does not exist")
             return
 
-        if bytes_result.startswith("0x"):
-            bytes_result = bytes.fromhex(bytes_result[2:])
-
-        root_state: "SubnetState" = SubnetState.from_vec_u8(bytes_result)
         if len(root_state.hotkeys) == 0:
             err_console.print(
                 "The root-subnet is currently empty with 0 UIDs registered."
@@ -991,33 +983,39 @@ async def show(
     """
             )
         if delegate_selection:
+            valid_uids = [str(row[0]) for row in sorted_rows[:max_rows]]
             while True:
                 selection = Prompt.ask(
-                    "\nEnter the position of the delegate you want to stake to [dim](or press Enter to cancel)[/dim]",
+                    "\nEnter the Position of the delegate you want to stake to [dim](or press Enter to cancel)[/dim]",
                     default="",
+                    choices=[""] + valid_uids,
+                    show_choices=False,
+                    show_default=False,
                 )
 
                 if selection == "":
                     return None
 
-                try:
-                    idx = int(selection)
-                    if 1 <= idx <= max_rows:
-                        selected_hotkey = sorted_hks_delegation[idx - 1]
-                        row_data = sorted_rows[idx - 1]
-                        identity = "" if row_data[5] == "~" else row_data[5]
-                        identity_str = f" ({identity})" if identity else ""
-                        console.print(
-                            f"\nSelected delegate: [{COLOR_PALETTE['GENERAL']['SUBHEADING']}]{selected_hotkey}{identity_str}"
-                        )
+                position = int(selection)
+                idx = position - 1
+                original_idx = sorted_hotkeys[idx][0]
+                selected_hotkey = root_state.hotkeys[original_idx]
+
+                coldkey_identity = identities.get(
+                    root_state.coldkeys[original_idx], {}
+                ).get("name", "")
+                hotkey_identity = old_identities.get(selected_hotkey)
+                validator_identity = (
+                    coldkey_identity
+                    if coldkey_identity
+                    else (hotkey_identity.display if hotkey_identity else "")
+                )
+                identity_str = f" ({validator_identity})" if validator_identity else ""
 
-                        return selected_hotkey
-                    else:
-                        console.print(
-                            f"[red]Invalid selection. Please enter a number between 1 and {max_rows}[/red]"
-                        )
-                except ValueError:
-                    console.print("[red]Please enter a valid number[/red]")
+                console.print(
+                    f"\nSelected delegate: [{COLOR_PALETTE['GENERAL']['SUBHEADING']}]{selected_hotkey}{identity_str}"
+                )
+                return selected_hotkey
 
     async def show_subnet(netuid_: int):
         if not await subtensor.subnet_exists(netuid=netuid):
@@ -1025,35 +1023,24 @@ async def show(
             raise typer.Exit()
         (
             subnet_info,
-            hex_bytes_result,
+            subnet_state,
             identities,
             old_identities,
         ) = await asyncio.gather(
             subtensor.subnet(netuid=netuid_),
-            subtensor.query_runtime_api(
-                runtime_api="SubnetInfoRuntimeApi",
-                method="get_subnet_state",
-                params=[netuid_],
-            ),
+            subtensor.get_subnet_state(netuid=netuid_),
             subtensor.query_all_identities(),
             subtensor.get_delegate_identities(),
         )
-        if subnet_info is None:
+        if subnet_state is None:
             print_error(f"Subnet {netuid_} does not exist")
             raise typer.Exit()
 
-        if (bytes_result := hex_bytes_result) is None:
-            print_error(f"Subnet {netuid_} does not exist")
-            raise typer.Exit()
-
-        if bytes_result.startswith("0x"):
-            bytes_result = bytes.fromhex(bytes_result[2:])
-
-        subnet_state: "SubnetState" = SubnetState.from_vec_u8(bytes_result)
         if subnet_info is None:
             print_error(f"Subnet {netuid_} does not exist")
             raise typer.Exit()
-        elif len(subnet_state.hotkeys) == 0:
+
+        if len(subnet_state.hotkeys) == 0:
             print_error(f"Subnet {netuid_} is currently empty with 0 UIDs registered.")
             raise typer.Exit()
 
@@ -1072,10 +1059,6 @@ async def show(
             pad_edge=True,
         )
 
-        # Add index for selection if selecting delegates
-        if delegate_selection:
-            table.add_column("#", style="cyan", justify="right")
-
         # For hotkey_block_emission calculation
         emission_sum = sum(
             [
@@ -1266,8 +1249,6 @@ async def show(
         )
         for pos, row in enumerate(rows, 1):
             table_row = []
-            if delegate_selection:
-                table_row.append(str(pos))
             table_row.extend(row)
             table.add_row(*table_row)
             if delegate_selection and pos == max_rows:
@@ -1320,20 +1301,24 @@ async def show(
 
         if delegate_selection:
             while True:
+                valid_uids = [str(row[0]) for row in rows[:max_rows]]
                 selection = Prompt.ask(
-                    "\nEnter the number of the delegate you want to stake to [dim](or press Enter to cancel)[/dim]",
+                    "\nEnter the UID of the delegate you want to stake to [dim](or press Enter to cancel)[/dim]",
                     default="",
+                    choices=[""] + valid_uids,
+                    show_choices=False,
+                    show_default=False,
                 )
 
                 if selection == "":
                     return None
 
                 try:
-                    idx = int(selection)
-                    if 1 <= idx <= max_rows:
-                        uid = int(rows[idx - 1][0])
+                    uid = int(selection)
+                    # Check if the UID exists in the subnet
+                    if uid in [int(row[0]) for row in rows]:
+                        row_data = next(row for row in rows if int(row[0]) == uid)
                         hotkey = subnet_state.hotkeys[uid]
-                        row_data = rows[idx - 1]
                         identity = "" if row_data[9] == "~" else row_data[9]
                         identity_str = f" ({identity})" if identity else ""
                         console.print(
@@ -1342,7 +1327,7 @@ async def show(
                         return hotkey
                     else:
                         console.print(
-                            f"[red]Invalid selection. Please enter a number between 1 and {max_rows}[/red]"
+                            f"[red]Invalid UID. Please enter a valid UID from the table above[/red]"
                         )
                 except ValueError:
                     console.print("[red]Please enter a valid number[/red]")
@@ -1585,7 +1570,13 @@ async def metagraph_cmd(
                 print_error(f"Subnet with netuid: {netuid} does not exist", status)
                 return False
 
-            neurons, difficulty_, total_issuance_, block = await asyncio.gather(
+            (
+                neurons,
+                difficulty_,
+                total_issuance_,
+                block,
+                subnet_state,
+            ) = await asyncio.gather(
                 subtensor.neurons(netuid, block_hash=block_hash),
                 subtensor.get_hyperparameter(
                     param_name="Difficulty", netuid=netuid, block_hash=block_hash
@@ -1597,22 +1588,9 @@ async def metagraph_cmd(
                     block_hash=block_hash,
                 ),
                 subtensor.substrate.get_block_number(block_hash=block_hash),
+                subtensor.get_subnet_state(netuid=netuid),
             )
 
-            hex_bytes_result = await subtensor.query_runtime_api(
-                runtime_api="SubnetInfoRuntimeApi",
-                method="get_subnet_state",
-                params=[netuid],
-            )
-            if not (bytes_result := hex_bytes_result):
-                err_console.print(f"Subnet {netuid} does not exist")
-                return
-
-            if bytes_result.startswith("0x"):
-                bytes_result = bytes.fromhex(bytes_result[2:])
-
-            subnet_state: "SubnetState" = SubnetState.from_vec_u8(bytes_result)
-
         difficulty = int(difficulty_)
         total_issuance = Balance.from_rao(total_issuance_)
         metagraph = MiniGraph(

{bittensor_cli-8.2.0rc14.dist-info → bittensor_cli-8.2.0rc15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bittensor-cli
-Version: 8.2.0rc14
+Version: 8.2.0rc15
 Summary: Bittensor CLI
 Home-page: https://github.com/opentensor/btcli
 Author: bittensor.com

{bittensor_cli-8.2.0rc14.dist-info → bittensor_cli-8.2.0rc15.dist-info}/RECORD

@@ -1,14 +1,14 @@
-bittensor_cli/__init__.py,sha256=Loe--RajOIR8vCTua14sZsUSnSHLdBA2Mb0hFBSoECQ,1221
-bittensor_cli/cli.py,sha256=WsPsMHOWNdqUKgNbXDyr-fgQeO8shn8-xlndWgzNBJ4,170158
+bittensor_cli/__init__.py,sha256=ZYU7KUzCNWfB7qHzWaA9DQN0qXv3gAQ689sTTWJv9RM,1221
+bittensor_cli/cli.py,sha256=Fnz8znP8gSEW81PQDp3krWMad30YKFX3GnXz7czem1Q,170276
 bittensor_cli/doc_generation_helper.py,sha256=GexqjEIKulWg84hpNBEchJ840oOgOi7DWpt447nsdNI,91
 bittensor_cli/src/__init__.py,sha256=KprSr1MmKKyh15PYcnA57mbX1svihIXyrtwnUIaUvbk,32042
 bittensor_cli/src/bittensor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bittensor_cli/src/bittensor/async_substrate_interface.py,sha256=qetCcD5qlAxeedhQ0cwfHo6QSjohCljJarqyzKpcHFQ,103240
 bittensor_cli/src/bittensor/balances.py,sha256=1ch3c4Gc3IRgIn8MMfbavQm71n3N_fUH7j9EGM6oH6M,11436
-bittensor_cli/src/bittensor/chain_data.py,sha256=zRQdZXERrRxqWXcdS3XgST1bgwcuEn4aGYtK6SbqtVk,59832
+bittensor_cli/src/bittensor/chain_data.py,sha256=WPMzvS8YgIJzMRC1AOba1p3HDTR7zK_l-OoSi6o1cbI,60034
 bittensor_cli/src/bittensor/minigraph.py,sha256=MCiuLRn9lhGoO1aKrM7YOiQAmANxFRkknwHCcjpn8uw,10499
 bittensor_cli/src/bittensor/networking.py,sha256=pZLMs8YXpZzDMLXWMBb_Bj6TVkm_q9khyY-lnbwVMuE,462
-bittensor_cli/src/bittensor/subtensor_interface.py,sha256=ceB6nwEIDShFEKkHwZ6vGOEC8bNFxBfy3XzkH7izvZs,56357
+bittensor_cli/src/bittensor/subtensor_interface.py,sha256=bF1-ziyWr7Xg8oVRyql9qmpG6TvYqRi_HJHcgSE476k,57384
 bittensor_cli/src/bittensor/utils.py,sha256=-t51UAbvs2WA6bFe6DxrAN_eINfaMXCud3bnABAjzZE,41421
 bittensor_cli/src/bittensor/extrinsics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bittensor_cli/src/bittensor/extrinsics/registration.py,sha256=p_ARqDiniDNL-ZPuswfk_DJW5kl5rMNxL_uRbfVTkTA,64599
@@ -22,12 +22,12 @@ bittensor_cli/src/commands/weights.py,sha256=3BCqVB1-W6BG0U_iOtuUZmFOQ9QngsnXAkB
 bittensor_cli/src/commands/stake/__init__.py,sha256=kcQE86CfemAw2LoNBHA_FIwixf4VyJ26FT10f0peJEU,6569
 bittensor_cli/src/commands/stake/children_hotkeys.py,sha256=WTFR0oprtOzMc5x0MXtWm595Bd4yK9iZCymwc3whr0U,28215
 bittensor_cli/src/commands/stake/move.py,sha256=c0YsQxKcFYJ8Bf6Gg_8_t99QV5RBx_KiuKCkHLc2fZ4,37199
-bittensor_cli/src/commands/stake/stake.py,sha256=hCJzZScVeJ4bpGnCnzZcPq7gPpZ3U_qOUKloB7rZfuU,78705
+bittensor_cli/src/commands/stake/stake.py,sha256=L-xi1O82lL2jeLBN3GCjiKnZjDYzZwCvUlp8P7faOAM,78813
 bittensor_cli/src/commands/subnets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bittensor_cli/src/commands/subnets/price.py,sha256=TWcRXUFeS_Q-pfyv0YIluAL8SE7d2gzTODK-9M2J5pw,29878
-bittensor_cli/src/commands/subnets/subnets.py,sha256=9nMoAjMe7l6gUsd3snk8IU-rwwtFM9Ntw_HWS9uxlkk,80784
-bittensor_cli-8.2.0rc14.dist-info/METADATA,sha256=MKLDM6O03vN2ClHMxHEBRyZDlAj0DClN2J2mnuqv0-U,6885
-bittensor_cli-8.2.0rc14.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-bittensor_cli-8.2.0rc14.dist-info/entry_points.txt,sha256=hBTLGLbVxmAKy69XSKaUZvjTCmyEzDGZKq4S8UOto8I,49
-bittensor_cli-8.2.0rc14.dist-info/top_level.txt,sha256=DvgvXpmTtI_Q1BbDZMlK90LFcGFCreN1daViEPV2iFw,14
-bittensor_cli-8.2.0rc14.dist-info/RECORD,,
+bittensor_cli/src/commands/subnets/subnets.py,sha256=g5fsmJlrZFmABMReBg6whu0A4QplBxx5bMsM1himpfo,79808
+bittensor_cli-8.2.0rc15.dist-info/METADATA,sha256=Z8ehWeQw4iUaZbo6-IhFf_SLFMaRayWWB9PKOfHhy5A,6885
+bittensor_cli-8.2.0rc15.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+bittensor_cli-8.2.0rc15.dist-info/entry_points.txt,sha256=hBTLGLbVxmAKy69XSKaUZvjTCmyEzDGZKq4S8UOto8I,49
+bittensor_cli-8.2.0rc15.dist-info/top_level.txt,sha256=DvgvXpmTtI_Q1BbDZMlK90LFcGFCreN1daViEPV2iFw,14
+bittensor_cli-8.2.0rc15.dist-info/RECORD,,