bittensor-cli 9.0.0rc2__py3-none-any.whl → 9.0.0rc3__py3-none-any.whl

bittensor_cli/cli.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import asyncio
 import curses
+import importlib
 import os.path
 import re
 import ssl
@@ -32,7 +33,13 @@ from async_substrate_interface.errors import SubstrateRequestException
 from bittensor_cli.src.commands import sudo, wallets
 from bittensor_cli.src.commands import weights as weights_cmds
 from bittensor_cli.src.commands.subnets import price, subnets
-from bittensor_cli.src.commands.stake import children_hotkeys, stake, move
+from bittensor_cli.src.commands.stake import (
+    children_hotkeys,
+    list as list_stake,
+    move as move_stake,
+    add as add_stake,
+    remove as remove_stake,
+)
 from bittensor_cli.src.bittensor.subtensor_interface import SubtensorInterface
 from bittensor_cli.src.bittensor.chain_data import SubnetHyperparameters
 from bittensor_cli.src.bittensor.utils import (
@@ -50,9 +57,9 @@ from bittensor_cli.src.bittensor.utils import (
     prompt_for_subnet_identity,
     print_linux_dependency_message,
     is_linux,
+    validate_rate_tolerance,
 )
 from typing_extensions import Annotated
-from textwrap import dedent
 from websockets import ConnectionClosed, InvalidHandshake
 from yaml import safe_dump, safe_load
 
@@ -65,7 +72,7 @@ except ImportError:
         pass
 
 
-__version__ = "9.0.0rc2"
+__version__ = "9.0.0rc3"
 
 
 _core_version = re.match(r"^\d+\.\d+\.\d+", __version__).group(0)
@@ -169,13 +176,13 @@ class Options:
     )
     netuid = typer.Option(
         None,
-        help="The netuid of the subnet in the root network, (e.g. 1).",
+        help="The netuid of the subnet in the network, (e.g. 1).",
         prompt=True,
         callback=validate_netuid,
     )
     netuid_not_req = typer.Option(
         None,
-        help="The netuid of the subnet in the root network, (e.g. 1).",
+        help="The netuid of the subnet in the network, (e.g. 1).",
         prompt=False,
     )
     all_netuids = typer.Option(
@@ -238,6 +245,28 @@ class Options:
         help="Create wallet from uri (e.g. 'Alice', 'Bob', 'Charlie', 'Dave', 'Eve')",
         callback=validate_uri,
     )
+    rate_tolerance = typer.Option(
+        None,
+        "--slippage",
+        "--slippage-tolerance",
+        "--tolerance",
+        help="Set the rate tolerance percentage for transactions (default: 0.05%).",
+        callback=validate_rate_tolerance,
+    )
+    safe_staking = typer.Option(
+        None,
+        "--safe-staking/--no-safe-staking",
+        "--safe/--unsafe",
+        help="Enable or disable safe staking mode (default: enabled).",
+    )
+    allow_partial_stake = typer.Option(
+        None,
+        "--allow-partial-stake/--no-allow-partial-stake",
+        "--partial/--no-partial",
+        "--allow/--not-allow",
+        "--allow-partial/--not-partial",
+        help="Enable or disable partial stake mode (default: disabled).",
+    )
 
 
 def list_prompt(init_var: list, list_type: type, help_text: str) -> list:
@@ -504,6 +533,7 @@ class CLIManager:
     subnets_app: typer.Typer
     weights_app: typer.Typer
     utils_app = typer.Typer(epilog=_epilog)
+    asyncio_runner = asyncio
 
     def __init__(self):
         self.config = {
@@ -512,25 +542,29 @@ class CLIManager:
             "wallet_hotkey": None,
             "network": None,
             "use_cache": True,
-            "metagraph_cols": {
-                "UID": True,
-                "GLOBAL_STAKE": True,
-                "LOCAL_STAKE": True,
-                "STAKE_WEIGHT": True,
-                "RANK": True,
-                "TRUST": True,
-                "CONSENSUS": True,
-                "INCENTIVE": True,
-                "DIVIDENDS": True,
-                "EMISSION": True,
-                "VTRUST": True,
-                "VAL": True,
-                "UPDATED": True,
-                "ACTIVE": True,
-                "AXON": True,
-                "HOTKEY": True,
-                "COLDKEY": True,
-            },
+            "rate_tolerance": None,
+            "safe_staking": True,
+            "allow_partial_stake": False,
+            # Commenting this out as this needs to get updated
+            # "metagraph_cols": {
+            #     "UID": True,
+            #     "GLOBAL_STAKE": True,
+            #     "LOCAL_STAKE": True,
+            #     "STAKE_WEIGHT": True,
+            #     "RANK": True,
+            #     "TRUST": True,
+            #     "CONSENSUS": True,
+            #     "INCENTIVE": True,
+            #     "DIVIDENDS": True,
+            #     "EMISSION": True,
+            #     "VTRUST": True,
+            #     "VAL": True,
+            #     "UPDATED": True,
+            #     "ACTIVE": True,
+            #     "AXON": True,
+            #     "HOTKEY": True,
+            #     "COLDKEY": True,
+            # },
         }
         self.subtensor = None
         self.config_base_path = os.path.expanduser(defaults.config.base_path)
@@ -629,7 +663,7 @@ class CLIManager:
         self.config_app.command("set")(self.set_config)
         self.config_app.command("get")(self.get_config)
         self.config_app.command("clear")(self.del_config)
-        self.config_app.command("metagraph")(self.metagraph_config)
+        self.config_app.command("metagraph", hidden=True)(self.metagraph_config)
 
         # wallet commands
         self.wallet_app.command(
@@ -923,9 +957,12 @@ class CLIManager:
                 ConnectionClosed,
                 SubstrateRequestException,
                 KeyboardInterrupt,
+                RuntimeError,
             ) as e:
                 if isinstance(e, SubstrateRequestException):
                     err_console.print(str(e))
+                elif isinstance(e, RuntimeError):
+                    pass  # Temporarily to handle loop bound issues
                 verbose_console.print(traceback.format_exc())
             except Exception as e:
                 err_console.print(f"An unknown error has occurred: {e}")
@@ -937,15 +974,12 @@ class CLIManager:
                     try:
                         raise typer.Exit()
                     except Exception as e:  # ensures we always exit cleanly
-                        if not isinstance(e, (typer.Exit, RuntimeError)): # temporarily to handle multiple run commands in one session
+                        if not isinstance(
+                            e, (typer.Exit, RuntimeError)
+                        ):  # temporarily to handle multiple run commands in one session
                             err_console.print(f"An unknown error has occurred: {e}")
 
-        if sys.version_info < (3, 10):
-            # For Python 3.9 or lower
-            return asyncio.get_event_loop().run_until_complete(_run())
-        else:
-            # For Python 3.10 or higher
-            return asyncio.run(_run())
+        return self.asyncio_runner(_run())
 
     def main_callback(
         self,
@@ -996,6 +1030,20 @@ class CLIManager:
             if k in self.config.keys():
                 self.config[k] = v
 
+        if sys.version_info < (3, 10):
+            # For Python 3.9 or lower
+            self.asyncio_runner = asyncio.get_event_loop().run_until_complete
+        else:
+            try:
+                uvloop = importlib.import_module("uvloop")
+                if sys.version_info >= (3, 11):
+                    self.asyncio_runner = uvloop.run
+                else:
+                    uvloop.install()
+                    self.asyncio_runner = asyncio.run
+            except ModuleNotFoundError:
+                self.asyncio_runner = asyncio.run
+
     def verbosity_handler(self, quiet: bool, verbose: bool):
         if quiet and verbose:
             err_console.print("Cannot specify both `--quiet` and `--verbose`")
@@ -1052,9 +1100,44 @@ class CLIManager:
             help="Disable caching of some commands. This will disable the `--reuse-last` and `--html` flags on "
             "commands such as `subnets metagraph`, `stake show` and `subnets list`.",
         ),
+        rate_tolerance: Optional[float] = typer.Option(
+            None,
+            "--slippage",
+            "--slippage-tolerance",
+            "--tolerance",
+            help="Set the rate tolerance percentage for transactions (e.g. 0.1 for 0.1%).",
+        ),
+        safe_staking: Optional[bool] = typer.Option(
+            None,
+            "--safe-staking/--no-safe-staking",
+            "--safe/--unsafe",
+            help="Enable or disable safe staking mode.",
+        ),
+        allow_partial_stake: Optional[bool] = typer.Option(
+            None,
+            "--allow-partial-stake/--no-allow-partial-stake",
+            "--partial/--no-partial",
+            "--allow/--not-allow",
+        ),
     ):
         """
-        Sets the values in the config file. To set the metagraph configuration, use the command `btcli config metagraph`
+        Sets or updates configuration values in the BTCLI config file.
+
+        This command allows you to set default values that will be used across all BTCLI commands.
+
+        USAGE
+        Interactive mode:
+            [green]$[/green] btcli config set
+
+        Set specific values:
+            [green]$[/green] btcli config set --wallet-name default --network finney
+            [green]$[/green] btcli config set --safe-staking --rate-tolerance 0.1
+
+        [bold]NOTE[/bold]:
+        - Network values can be network names (e.g., 'finney', 'test') or websocket URLs
+        - Rate tolerance is specified as a decimal (e.g., 0.05 for 0.05%)
+        - Changes are saved to ~/.bittensor/btcli.yaml
+        - Use '[green]$[/green] btcli config get' to view current settings
         """
         args = {
             "wallet_name": wallet_name,
@@ -1062,8 +1145,11 @@ class CLIManager:
             "wallet_hotkey": wallet_hotkey,
             "network": network,
             "use_cache": use_cache,
+            "rate_tolerance": rate_tolerance,
+            "safe_staking": safe_staking,
+            "allow_partial_stake": allow_partial_stake,
         }
-        bools = ["use_cache"]
+        bools = ["use_cache", "safe_staking", "allow_partial_stake"]
         if all(v is None for v in args.values()):
             # Print existing configs
             self.get_config()
@@ -1087,6 +1173,20 @@ class CLIManager:
                     default=True,
                 )
                 self.config[arg] = nc
+
+            elif arg == "rate_tolerance":
+                while True:
+                    val = FloatPrompt.ask(
+                        f"What percentage would you like to set for [red]{arg}[/red]?\nValues are percentages (e.g. 0.05 for 5%)",
+                        default=0.05,
+                    )
+                    try:
+                        validated_val = validate_rate_tolerance(val)
+                        self.config[arg] = validated_val
+                        break
+                    except typer.BadParameter as e:
+                        print_error(str(e))
+                        continue
             else:
                 val = Prompt.ask(
                     f"What value would you like to assign to [red]{arg}[/red]?"
@@ -1144,6 +1244,18 @@ class CLIManager:
         wallet_hotkey: bool = typer.Option(False, *Options.wallet_hotkey.param_decls),
         network: bool = typer.Option(False, *Options.network.param_decls),
         use_cache: bool = typer.Option(False, "--cache"),
+        rate_tolerance: bool = typer.Option(
+            False, "--slippage", "--slippage-tolerance", "--tolerance"
+        ),
+        safe_staking: bool = typer.Option(
+            False, "--safe-staking/--no-safe-staking", "--safe/--unsafe"
+        ),
+        allow_partial_stake: bool = typer.Option(
+            False,
+            "--allow-partial-stake/--no-allow-partial-stake",
+            "--partial/--no-partial",
+            "--allow/--not-allow",
+        ),
         all_items: bool = typer.Option(False, "--all"),
     ):
         """
@@ -1173,6 +1285,9 @@ class CLIManager:
             "wallet_hotkey": wallet_hotkey,
             "network": network,
             "use_cache": use_cache,
+            "rate_tolerance": rate_tolerance,
+            "safe_staking": safe_staking,
+            "allow_partial_stake": allow_partial_stake,
         }
 
         # If no specific argument is provided, iterate over all
@@ -1234,6 +1349,8 @@ class CLIManager:
                 else:
                     if value in Constants.networks:
                         value = value + f" ({Constants.network_map[value]})"
+            if key == "rate_tolerance":
+                value = f"{value} ({value*100}%)" if value is not None else "None"
 
             elif key in deprecated_configs:
                 continue
@@ -1246,13 +1363,112 @@ class CLIManager:
                 table.add_row(str(key), str(value), "")
 
         console.print(table)
-        console.print(
-            dedent(
-                """
-            [red]Deprecation notice[/red]: The chain endpoint config is now deprecated. You can use the network config to pass chain endpoints.
-            """
+
+    def ask_rate_tolerance(
+        self,
+        rate_tolerance: Optional[float],
+    ) -> float:
+        """
+        Gets rate tolerance from args, config, or default.
+
+        Args:
+            rate_tolerance (Optional[float]): Explicitly provided slippage value
+
+        Returns:
+            float: rate tolerance value
+        """
+        if rate_tolerance is not None:
+            console.print(
+                f"[dim][blue]Rate tolerance[/blue]: [bold cyan]{rate_tolerance} ({rate_tolerance*100}%)[/bold cyan]."
             )
-        )
+            return rate_tolerance
+        elif self.config.get("rate_tolerance") is not None:
+            config_slippage = self.config["rate_tolerance"]
+            console.print(
+                f"[dim][blue]Rate tolerance[/blue]: [bold cyan]{config_slippage} ({config_slippage*100}%)[/bold cyan] (from config)."
+            )
+            return config_slippage
+        else:
+            console.print(
+                "[dim][blue]Rate tolerance[/blue]: "
+                + f"[bold cyan]{defaults.rate_tolerance} ({defaults.rate_tolerance*100}%)[/bold cyan] "
+                + "by default. Set this using "
+                + "[dark_sea_green3 italic]`btcli config set`[/dark_sea_green3 italic] "
+                + "or "
+                + "[dark_sea_green3 italic]`--tolerance`[/dark_sea_green3 italic] flag[/dim]"
+            )
+            return defaults.rate_tolerance
+
+    def ask_safe_staking(
+        self,
+        safe_staking: Optional[bool],
+    ) -> bool:
+        """
+        Gets safe staking setting from args, config, or default.
+
+        Args:
+            safe_staking (Optional[bool]): Explicitly provided safe staking value
+
+        Returns:
+            bool: Safe staking setting
+        """
+        if safe_staking is not None:
+            console.print(
+                f"[dim][blue]Safe staking[/blue]: [bold cyan]{'enabled' if safe_staking else 'disabled'}[/bold cyan]."
+            )
+            return safe_staking
+        elif self.config.get("safe_staking") is not None:
+            safe_staking = self.config["safe_staking"]
+            console.print(
+                f"[dim][blue]Safe staking[/blue]: [bold cyan]{'enabled' if safe_staking else 'disabled'}[/bold cyan] (from config)."
+            )
+            return safe_staking
+        else:
+            safe_staking = True
+            console.print(
+                "[dim][blue]Safe staking[/blue]: "
+                + f"[bold cyan]{'enabled' if safe_staking else 'disabled'}[/bold cyan] "
+                + "by default. Set this using "
+                + "[dark_sea_green3 italic]`btcli config set`[/dark_sea_green3 italic] "
+                + "or "
+                + "[dark_sea_green3 italic]`--safe/--unsafe`[/dark_sea_green3 italic] flag[/dim]"
+            )
+            return safe_staking
+
+    def ask_partial_stake(
+        self,
+        allow_partial_stake: Optional[bool],
+    ) -> bool:
+        """
+        Gets partial stake setting from args, config, or default.
+
+        Args:
+            allow_partial_stake (Optional[bool]): Explicitly provided partial stake value
+
+        Returns:
+            bool: Partial stake setting
+        """
+        if allow_partial_stake is not None:
+            console.print(
+                f"[dim][blue]Partial staking[/blue]: [bold cyan]{'enabled' if allow_partial_stake else 'disabled'}[/bold cyan]."
+            )
+            return allow_partial_stake
+        elif self.config.get("allow_partial_stake") is not None:
+            config_partial = self.config["allow_partial_stake"]
+            console.print(
+                f"[dim][blue]Partial staking[/blue]: [bold cyan]{'enabled' if config_partial else 'disabled'}[/bold cyan] (from config)."
+            )
+            return config_partial
+        else:
+            console.print(
+                "[dim][blue]Partial staking[/blue]: "
+                + f"[bold cyan]{'enabled' if allow_partial_stake else 'disabled'}[/bold cyan] "
+                + "by default. Set this using "
+                + "[dark_sea_green3 italic]`btcli config set`[/dark_sea_green3 italic] "
+                + "or "
+                + "[dark_sea_green3 italic]`--partial/--no-partial`[/dark_sea_green3 italic] flag[/dim]"
+            )
+            return False
 
     def wallet_ask(
         self,
@@ -1410,50 +1626,9 @@ class CLIManager:
 
         USAGE
 
-        The command offers various options to customize the output. Users can filter the displayed data by specific
-        netuid, sort by different criteria, and choose to include all the wallets in the user's wallet path location.
-        The output is presented in a tabular format with the following columns:
-
-        - COLDKEY: The SS58 address of the coldkey.
-
-        - HOTKEY: The SS58 address of the hotkey.
-
-        - UID: Unique identifier of the neuron.
-
-        - ACTIVE: Indicates if the neuron is active.
-
-        - STAKE(τ): Amount of stake in the neuron, in TAO.
-
-        - RANK: The rank of the neuron within the network.
-
-        - TRUST: Trust score of the neuron.
-
-        - CONSENSUS: Consensus score of the neuron.
-
-        - INCENTIVE: Incentive score of the neuron.
-
-        - DIVIDENDS: Dividends earned by the neuron.
-
-        - EMISSION(p): Emission received by the neuron, expressed in rho.
-
-        - VTRUST: Validator trust score of the neuron.
-
-        - VPERMIT: Indicates if the neuron has a validator permit.
-
-        - UPDATED: Time since last update.
-
-        - AXON: IP address and port of the neuron.
-
-        - HOTKEY_SS58: Human-readable representation of the hotkey.
-
-
-        # EXAMPLE:
-
         [green]$[/green] btcli wallet overview
 
-        [green]$[/green] btcli wallet overview --all --sort-by stake --sort-order descending
-
-        [green]$[/green] btcli wallet overview -in hk1,hk2 --sort-by stake
+        [green]$[/green] btcli wallet overview --all
 
         [bold]NOTE[/bold]: This command is read-only and does not modify the blockchain state or account configuration.
         It provides a quick and comprehensive view of the user's network presence, making it useful for monitoring account status,
@@ -2561,7 +2736,25 @@ class CLIManager:
         no_prompt: bool = Options.prompt,
         # TODO add: all-wallets, reuse_last, html_output
     ):
-        """List all stake accounts for wallet."""
+        """
+        Display detailed stake information for a wallet across all subnets.
+
+        Shows stake allocations, exchange rates, and emissions for each hotkey.
+
+        [bold]Common Examples:[/bold]
+
+        1. Basic stake overview:
+        [green]$[/green] btcli stake list --wallet.name my_wallet
+
+        2. Live updating view with refresh:
+        [green]$[/green] btcli stake list --wallet.name my_wallet --live
+
+        3. View specific coldkey by address:
+        [green]$[/green] btcli stake list --ss58 5Dk...X3q
+
+        4. Verbose output with full values:
+        [green]$[/green] btcli stake list --wallet.name my_wallet --verbose
+        """
         self.verbosity_handler(quiet, verbose)
 
         wallet = None
@@ -2586,7 +2779,7 @@ class CLIManager:
                 )
 
         return self._run_command(
-            stake.stake_list(
+            list_stake.stake_list(
                 wallet,
                 coldkey_ss58,
                 self.initialize_chain(network),
@@ -2608,12 +2801,6 @@ class CLIManager:
         amount: float = typer.Option(
             0.0, "--amount", help="The amount of TAO to stake"
         ),
-        max_stake: float = typer.Option(
-            0.0,
-            "--max-stake",
-            "-m",
-            help="Stake is sent to a hotkey only until the hotkey's total stake is less than or equal to this maximum staked TAO. If a hotkey already has stake greater than this amount, then stake is not added to this hotkey.",
-        ),
         include_hotkeys: str = typer.Option(
             "",
             "--include-hotkeys",
@@ -2639,22 +2826,50 @@ class CLIManager:
         wallet_path: str = Options.wallet_path,
         wallet_hotkey: str = Options.wallet_hotkey,
         network: Optional[list[str]] = Options.network,
+        rate_tolerance: Optional[float] = Options.rate_tolerance,
+        safe_staking: Optional[bool] = Options.safe_staking,
+        allow_partial_stake: Optional[bool] = Options.allow_partial_stake,
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
     ):
         """
-        Stake TAO to one or more hotkeys associated with the user's coldkey.
+        Stake TAO to one or more hotkeys on specific netuids with your coldkey.
 
-        This command is used by a subnet validator to stake to their own hotkey. Compare this command with "btcli root delegate" that is typically run by a TAO holder to delegate their TAO to a delegate's hotkey.
+        Stake is always added through your coldkey's free balance. For stake movement, please see `[green]$[/green] btcli stake move` command.
 
-        This command is used by a subnet validator to allocate stake TAO to their different hotkeys, securing their position and influence on the network.
+        [bold]Common Examples:[/bold]
 
-        EXAMPLE
+        1. Interactive staking (guided prompts):
+            [green]$[/green] btcli stake add
+
+        2. Safe staking with rate tolerance of 10% with partial transaction disabled:
+            [green]$[/green] btcli stake add --amount 100 --netuid 1 --safe --tolerance 0.1 --no-partial
+
+        3. Allow partial stake if rates change with tolerance of 10%:
+            [green]$[/green] btcli stake add --amount 300 --safe --partial --tolerance 0.1
+
+        4. Unsafe staking with no rate protection:
+            [green]$[/green] btcli stake add --amount 300 --netuid 1 --unsafe
+
+        5. Stake to multiple hotkeys:
+            [green]$[/green] btcli stake add --amount 200 --include-hotkeys hk_ss58_1,hk_ss58_2,hk_ss58_3
+
+        6. Stake all balance to a subnet:
+            [green]$[/green] btcli stake add --all --netuid 3
+
+        [bold]Safe Staking Parameters:[/bold]
+        • [blue]--safe[/blue]: Enables rate tolerance checks
+        • [blue]--tolerance[/blue]: Maximum % rate change allowed (0.05 = 5%)
+        • [blue]--partial[/blue]: Complete partial stake if rates exceed tolerance
 
-        [green]$[/green] btcli stake add --amount 100 --wallet-name <my_wallet> --wallet-hotkey <my_hotkey>
         """
         self.verbosity_handler(quiet, verbose)
+        safe_staking = self.ask_safe_staking(safe_staking)
+        if safe_staking:
+            rate_tolerance = self.ask_rate_tolerance(rate_tolerance)
+            allow_partial_stake = self.ask_partial_stake(allow_partial_stake)
+            console.print("\n")
         netuid = get_optional_netuid(netuid, all_netuids)
 
         if stake_all and amount:
@@ -2764,8 +2979,8 @@ class CLIManager:
             excluded_hotkeys = []
 
         # TODO: Ask amount for each subnet explicitly if more than one
-        if not stake_all and not amount and not max_stake:
-            free_balance, staked_balance = self._run_command(
+        if not stake_all and not amount:
+            free_balance = self._run_command(
                 wallets.wallet_balance(
                     wallet, self.initialize_chain(network), False, None
                 ),
@@ -2793,18 +3008,19 @@ class CLIManager:
                 raise typer.Exit()
 
         return self._run_command(
-            stake.stake_add(
+            add_stake.stake_add(
                 wallet,
                 self.initialize_chain(network),
                 netuid,
                 stake_all,
                 amount,
-                False,
                 prompt,
-                max_stake,
                 all_hotkeys,
                 included_hotkeys,
                 excluded_hotkeys,
+                safe_staking,
+                rate_tolerance,
+                allow_partial_stake,
             )
         )
 
@@ -2837,12 +3053,6 @@ class CLIManager:
             "",
             help="The ss58 address of the hotkey to unstake from.",
         ),
-        keep_stake: float = typer.Option(
-            0.0,
-            "--keep-stake",
-            "--keep",
-            help="Sets the maximum amount of TAO to remain staked in each hotkey.",
-        ),
         include_hotkeys: str = typer.Option(
             "",
             "--include-hotkeys",
@@ -2861,6 +3071,9 @@ class CLIManager:
             help="When set, this command unstakes from all the hotkeys associated with the wallet. Do not use if specifying "
             "hotkeys in `--include-hotkeys`.",
         ),
+        rate_tolerance: Optional[float] = Options.rate_tolerance,
+        safe_staking: Optional[bool] = Options.safe_staking,
+        allow_partial_stake: Optional[bool] = Options.allow_partial_stake,
         prompt: bool = Options.prompt,
         interactive: bool = typer.Option(
             False,
@@ -2872,20 +3085,42 @@ class CLIManager:
         verbose: bool = Options.verbose,
     ):
         """
-        Unstake TAO from one or more hotkeys and transfer them back to the user's coldkey.
+        Unstake TAO from one or more hotkeys and transfer them back to the user's coldkey wallet.
 
-        This command is used to withdraw TAO previously staked to different hotkeys.
+        This command is used to withdraw TAO or Alpha stake from different hotkeys.
 
-        EXAMPLE
+        [bold]Common Examples:[/bold]
+
+        1. Interactive unstaking (guided prompts):
+            [green]$[/green] btcli stake remove
+
+        2. Safe unstaking with 10% rate tolerance:
+            [green]$[/green] btcli stake remove --amount 100 --netuid 1 --safe --tolerance 0.1
+
+        3. Allow partial unstake if rates change:
+            [green]$[/green] btcli stake remove --amount 300 --safe --partial
+
+        4. Unstake from multiple hotkeys:
+            [green]$[/green] btcli stake remove --amount 200 --include-hotkeys hk1,hk2,hk3
+
+        5. Unstake all from a hotkey:
+            [green]$[/green] btcli stake remove --all
 
-        [green]$[/green] btcli stake remove --amount 100 -in hk1,hk2
+        6. Unstake all Alpha from a hotkey and stake to Root:
+            [green]$[/green] btcli stake remove --all-alpha
 
-        [blue bold]Note[/blue bold]: This command is for users who wish to reallocate their stake or withdraw them from the network. It allows for flexible management of TAO stake across different neurons (hotkeys) on the network.
+        [bold]Safe Staking Parameters:[/bold]
+        • [blue]--safe[/blue]: Enables rate tolerance checks during unstaking
+        • [blue]--tolerance[/blue]: Max allowed rate change (0.05 = 5%)
+        • [blue]--partial[/blue]: Complete partial unstake if rates exceed tolerance
         """
         self.verbosity_handler(quiet, verbose)
-        # TODO: Coldkey related unstakes need to be updated. Patching for now.
-        unstake_all_alpha = False
-        unstake_all = False
+        if not unstake_all and not unstake_all_alpha:
+            safe_staking = self.ask_safe_staking(safe_staking)
+            if safe_staking:
+                rate_tolerance = self.ask_rate_tolerance(rate_tolerance)
+                allow_partial_stake = self.ask_partial_stake(allow_partial_stake)
+                console.print("\n")
 
         if interactive and any(
             [hotkey_ss58_address, include_hotkeys, exclude_hotkeys, all_hotkeys]
@@ -2961,6 +3196,52 @@ class CLIManager:
                     validate=WV.WALLET_AND_HOTKEY,
                 )
 
+        elif unstake_all or unstake_all_alpha:
+            if not wallet_name:
+                wallet_name = Prompt.ask(
+                    "Enter the [blue]wallet name[/blue]",
+                    default=self.config.get("wallet_name") or defaults.wallet.name,
+                )
+            if include_hotkeys:
+                if len(include_hotkeys) > 1:
+                    print_error("Cannot unstake_all from multiple hotkeys at once.")
+                    raise typer.Exit()
+                elif is_valid_ss58_address(include_hotkeys[0]):
+                    hotkey_ss58_address = include_hotkeys[0]
+                else:
+                    print_error("Invalid hotkey ss58 address.")
+                    raise typer.Exit()
+            else:
+                hotkey_or_ss58 = Prompt.ask(
+                    "Enter the [blue]hotkey[/blue] name or [blue]ss58 address[/blue] to unstake all from",
+                    default=self.config.get("wallet_hotkey") or defaults.wallet.hotkey,
+                )
+                if is_valid_ss58_address(hotkey_or_ss58):
+                    hotkey_ss58_address = hotkey_or_ss58
+                    wallet = self.wallet_ask(
+                        wallet_name,
+                        wallet_path,
+                        wallet_hotkey,
+                        ask_for=[WO.NAME, WO.PATH],
+                    )
+                else:
+                    wallet_hotkey = hotkey_or_ss58
+                    wallet = self.wallet_ask(
+                        wallet_name,
+                        wallet_path,
+                        wallet_hotkey,
+                        ask_for=[WO.NAME, WO.PATH, WO.HOTKEY],
+                        validate=WV.WALLET_AND_HOTKEY,
+                    )
+            return self._run_command(
+                remove_stake.unstake_all(
+                    wallet=wallet,
+                    subtensor=self.initialize_chain(network),
+                    hotkey_ss58_address=hotkey_ss58_address,
+                    unstake_all_alpha=unstake_all_alpha,
+                    prompt=prompt,
+                )
+            )
         elif (
             all_hotkeys
             or include_hotkeys
@@ -3003,20 +3284,20 @@ class CLIManager:
             excluded_hotkeys = []
 
         return self._run_command(
-            stake.unstake(
-                wallet,
-                self.initialize_chain(network),
-                hotkey_ss58_address,
-                all_hotkeys,
-                included_hotkeys,
-                excluded_hotkeys,
-                amount,
-                keep_stake,
-                unstake_all,
-                prompt,
-                interactive,
+            remove_stake.unstake(
+                wallet=wallet,
+                subtensor=self.initialize_chain(network),
+                hotkey_ss58_address=hotkey_ss58_address,
+                all_hotkeys=all_hotkeys,
+                include_hotkeys=included_hotkeys,
+                exclude_hotkeys=excluded_hotkeys,
+                amount=amount,
+                prompt=prompt,
+                interactive=interactive,
                 netuid=netuid,
-                unstake_all_alpha=unstake_all_alpha,
+                safe_staking=safe_staking,
+                rate_tolerance=rate_tolerance,
+                allow_partial_stake=allow_partial_stake,
             )
         )
 
@@ -3159,7 +3440,7 @@ class CLIManager:
                 )
 
         return self._run_command(
-            move.move_stake(
+            move_stake.move_stake(
                 subtensor=self.initialize_chain(network),
                 wallet=wallet,
                 origin_netuid=origin_netuid,
@@ -3277,7 +3558,7 @@ class CLIManager:
                 )
 
         return self._run_command(
-            move.transfer_stake(
+            move_stake.transfer_stake(
                 wallet=wallet,
                 subtensor=self.initialize_chain(network),
                 origin_netuid=origin_netuid,
@@ -3376,7 +3657,7 @@ class CLIManager:
                 amount = FloatPrompt.ask("Enter the [blue]amount[/blue] to swap")
 
         return self._run_command(
-            move.swap_stake(
+            move_stake.swap_stake(
                 wallet=wallet,
                 subtensor=self.initialize_chain(network),
                 origin_netuid=origin_netuid,
@@ -3737,8 +4018,6 @@ class CLIManager:
         """
         Shows a list of the hyperparameters for the specified subnet.
 
-        The output of this command is the same as that of `btcli subnets hyperparameters`.
-
         EXAMPLE
 
         [green]$[/green] btcli sudo get --netuid 1
@@ -3914,40 +4193,37 @@ class CLIManager:
     def subnets_list(
         self,
         network: Optional[list[str]] = Options.network,
-        # reuse_last: bool = Options.reuse_last,
-        # html_output: bool = Options.html_output,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
         live_mode: bool = Options.live,
     ):
         """
-        List all subnets and their detailed information.
+         List all subnets and their detailed information.
 
-        This command displays a table with the below columns:
+         [bold]Common Examples:[/bold]
 
-        - NETUID: The subnet's netuid.
-        - N: The number of neurons (subnet validators and subnet miners) in the subnet.
-        - MAX_N: The maximum allowed number of neurons in the subnet.
-        - EMISSION: The percentage of emissions to the subnet as of the last tempo.
-        - TEMPO: The subnet's tempo, expressed in number of blocks.
-        - RECYCLE: The recycle register cost for this subnet.
-        - POW: The proof of work (PoW) difficulty.
-        - SUDO: The subnet owner's name or the owner's ss58 address.
+         1. List all subnets:
+         [green]$[/green] btcli subnets list
 
-        EXAMPLE
+         2. List all subnets in live mode:
+         [green]$[/green] btcli subnets list --live
 
-        [green]$[/green] btcli subnets list
+        [bold]Output Columns:[/bold]
+         • [white]Netuid[/white] - Subnet identifier number
+         • [white]Name[/white] - Subnet name with currency symbol (τ/α/β etc)
+         • [white]Price (τ_in/α_in)[/white] - Exchange rate (TAO per alpha token)
+         • [white]Market Cap (α * Price)[/white] - Total value in TAO (alpha tokens × price)
+         • [white]Emission (τ)[/white] - TAO rewards emitted per block to subnet
+         • [white]P (τ_in, α_in)[/white] - Pool reserves (Tao reserves, alpha reserves) in liquidity pool
+         • [white]Stake (α_out)[/white] - Total staked alpha tokens across all hotkeys (alpha outstanding)
+         • [white]Supply (α)[/white] - Circulating alpha token supply
+         • [white]Tempo (k/n)[/white] - Block interval for subnet updates
+
+         EXAMPLE
+
+         [green]$[/green] btcli subnets list
         """
         self.verbosity_handler(quiet, verbose)
-        # if (reuse_last or html_output) and self.config.get("use_cache") is False:
-        #     err_console.print(
-        #         "Unable to use `--reuse-last` or `--html` when config 'no-cache' is set to 'True'. "
-        #         "Change the config to 'False' using `btcli config set`."
-        #     )
-        #     raise typer.Exit()
-        # if reuse_last:
-        #     subtensor = None
-        # else:
         subtensor = self.initialize_chain(network)
         return self._run_command(
             subnets.subnets_list(
@@ -4127,11 +4403,18 @@ class CLIManager:
         verbose: bool = Options.verbose,
     ):
         """
-        Registers a new subnet.
+        Registers a new subnet on the network.
 
-        EXAMPLE
+        This command allows you to create a new subnet and set the subnet's identity.
+        You also have the option to set your own identity after the registration is complete.
 
+        [bold]Common Examples:[/bold]
+
+        1. Interactive subnet creation:
         [green]$[/green] btcli subnets create
+
+        2. Create with GitHub repo and contact email:
+        [green]$[/green] btcli subnets create --subnet-name MySubnet --github-repo https://github.com/myorg/mysubnet --subnet-contact team@mysubnet.net
         """
         self.verbosity_handler(quiet, verbose)
         wallet = self.wallet_ask(