bittensor-cli 9.1.0__py3-none-any.whl → 9.1.1__py3-none-any.whl

bittensor_cli/src/commands/stake/move.py

@@ -1,10 +1,8 @@
 import asyncio
 
 from typing import TYPE_CHECKING
-import typer
 
 from bittensor_wallet import Wallet
-from bittensor_wallet.errors import KeyFileError
 from rich.table import Table
 from rich.prompt import Confirm, Prompt
 
@@ -41,6 +39,11 @@ async def display_stake_movement_cross_subnets(
         subnet = await subtensor.subnet(origin_netuid)
         received_amount_tao = subnet.alpha_to_tao(amount_to_move)
         received_amount_tao -= MIN_STAKE_FEE
+
+        if received_amount_tao < Balance.from_tao(0):
+            print_error("Not enough Alpha to pay the transaction fee.")
+            raise ValueError
+
         received_amount = subnet.tao_to_alpha(received_amount_tao)
         slippage_pct_float = (
             100 * float(MIN_STAKE_FEE) / float(MIN_STAKE_FEE + received_amount_tao)
@@ -72,7 +75,7 @@ async def display_stake_movement_cross_subnets(
 
         if received_amount < Balance.from_tao(0):
             print_error("Not enough Alpha to pay the transaction fee.")
-            raise typer.Exit()
+            raise ValueError
 
         ideal_amount = amount_to_move * price
         total_slippage = ideal_amount - received_amount
@@ -207,7 +210,7 @@ def prompt_stake_amount(
             console.print("[red]Please enter a valid number or 'all'[/red]")
 
 
-async def stake_move_selection(
+async def stake_move_transfer_selection(
     subtensor: "SubtensorInterface",
     wallet: Wallet,
 ):
@@ -228,7 +231,7 @@ async def stake_move_selection(
 
     if not hotkey_stakes:
         print_error("You have no stakes to move.")
-        raise typer.Exit()
+        raise ValueError
 
     # Display hotkeys with stakes
     table = Table(
@@ -293,25 +296,24 @@ async def stake_move_selection(
         title_justify="center",
         width=len(origin_hotkey_ss58) + 20,
     )
-    table.add_column("Index", justify="right")
     table.add_column("Netuid", style="cyan")
     table.add_column("Stake Amount", style=COLOR_PALETTE["STAKE"]["STAKE_AMOUNT"])
 
     available_netuids = []
-    for idx, netuid in enumerate(origin_hotkey_info["netuids"]):
+    for netuid in origin_hotkey_info["netuids"]:
         stake = origin_hotkey_info["stakes"][netuid]
         if stake.tao > 0:
             available_netuids.append(netuid)
-            table.add_row(str(idx), str(netuid), str(stake))
+            table.add_row(str(netuid), str(stake))
 
     console.print("\n", table)
 
     # Select origin netuid
-    netuid_idx = Prompt.ask(
-        "\nEnter the index of the subnet you want to move stake from",
-        choices=[str(i) for i in range(len(available_netuids))],
+    origin_netuid = Prompt.ask(
+        "\nEnter the netuid you want to move stake from",
+        choices=[str(netuid) for netuid in available_netuids],
     )
-    origin_netuid = available_netuids[int(netuid_idx)]
+    origin_netuid = int(origin_netuid)
     origin_stake = origin_hotkey_info["stakes"][origin_netuid]
 
     # Ask for amount to move
@@ -334,104 +336,6 @@ async def stake_move_selection(
     }
 
 
-async def stake_transfer_selection(
-    wallet: Wallet, subtensor: "SubtensorInterface", origin_hotkey: str
-):
-    """Selection interface for transferring stakes."""
-    (
-        stakes,
-        all_netuids,
-        all_subnets,
-    ) = await asyncio.gather(
-        subtensor.get_stake_for_coldkey(coldkey_ss58=wallet.coldkeypub.ss58_address),
-        subtensor.get_all_subnet_netuids(),
-        subtensor.all_subnets(),
-    )
-    all_netuids = sorted(all_netuids)
-    all_subnets = {di.netuid: di for di in all_subnets}
-
-    available_stakes = {}
-    for stake in stakes:
-        if stake.stake.tao > 0 and stake.hotkey_ss58 == origin_hotkey:
-            available_stakes[stake.netuid] = {
-                "hotkey_ss58": stake.hotkey_ss58,
-                "stake": stake.stake,
-                "is_registered": stake.is_registered,
-            }
-
-    if not available_stakes:
-        console.print("[red]No stakes available to transfer.[/red]")
-        return None
-
-    table = Table(
-        title=(
-            f"\n[{COLOR_PALETTE['GENERAL']['HEADER']}]"
-            f"Available Stakes to Transfer\n"
-            f"for wallet hotkey:\n"
-            f"[{COLOR_PALETTE['GENERAL']['HOTKEY']}]{wallet.hotkey_str}: {wallet.hotkey.ss58_address}"
-            f"[/{COLOR_PALETTE['GENERAL']['HOTKEY']}]\n"
-        ),
-        show_edge=False,
-        header_style="bold white",
-        border_style="bright_black",
-        title_justify="center",
-        width=len(wallet.hotkey_str + wallet.hotkey.ss58_address) + 10,
-    )
-
-    table.add_column("Index", justify="right", style="cyan")
-    table.add_column("Netuid")
-    table.add_column("Name", style="cyan", justify="left")
-    table.add_column("Stake Amount", style=COLOR_PALETTE["STAKE"]["STAKE_AMOUNT"])
-    table.add_column("Registered", justify="center")
-
-    for idx, (netuid, stake_info) in enumerate(available_stakes.items()):
-        subnet_name_cell = (
-            f"[{COLOR_PALETTE['GENERAL']['SYMBOL']}]{all_subnets[netuid].symbol if netuid != 0 else 'τ'}[/{COLOR_PALETTE['GENERAL']['SYMBOL']}]"
-            f" {get_subnet_name(all_subnets[netuid])}"
-        )
-        table.add_row(
-            str(idx),
-            str(netuid),
-            subnet_name_cell,
-            str(stake_info["stake"]),
-            "[dark_sea_green3]YES"
-            if stake_info["is_registered"]
-            else f"[{COLOR_PALETTE['STAKE']['NOT_REGISTERED']}]NO",
-        )
-
-    console.print(table)
-
-    if not available_stakes:
-        console.print("[red]No stakes available to transfer.[/red]")
-        return None
-
-    # Prompt to select index of stake to transfer
-    selection = Prompt.ask(
-        "\nEnter the index of the stake you want to transfer",
-        choices=[str(i) for i in range(len(available_stakes))],
-    )
-    selected_netuid = list(available_stakes.keys())[int(selection)]
-    selected_stake = available_stakes[selected_netuid]
-
-    # Prompt for amount
-    stake_balance = selected_stake["stake"]
-    amount, _ = prompt_stake_amount(stake_balance, selected_netuid, "transfer")
-
-    # Prompt for destination subnet
-    destination_netuid = Prompt.ask(
-        "\nEnter the netuid of the subnet you want to move stake to"
-        + f" ([dim]{group_subnets(all_netuids)}[/dim])",
-        choices=[str(netuid) for netuid in all_netuids],
-        show_choices=False,
-    )
-
-    return {
-        "origin_netuid": selected_netuid,
-        "amount": amount.tao,
-        "destination_netuid": int(destination_netuid),
-    }
-
-
 async def stake_swap_selection(
     subtensor: "SubtensorInterface",
     wallet: Wallet,
@@ -457,7 +361,7 @@ async def stake_swap_selection(
 
     if not hotkey_stakes:
         print_error(f"No stakes found for hotkey: {wallet.hotkey_str}")
-        raise typer.Exit()
+        raise ValueError
 
     # Display available stakes
     table = Table(
@@ -540,7 +444,10 @@ async def move_stake(
     prompt: bool = True,
 ):
     if interactive_selection:
-        selection = await stake_move_selection(subtensor, wallet)
+        try:
+            selection = await stake_move_transfer_selection(subtensor, wallet)
+        except ValueError:
+            return False
         origin_hotkey = selection["origin_hotkey"]
         origin_netuid = selection["origin_netuid"]
         amount = selection["amount"]
@@ -571,7 +478,7 @@ async def move_stake(
             f"in Netuid: "
             f"[{COLOR_PALETTE['GENERAL']['SUBHEADING']}]{origin_netuid}[/{COLOR_PALETTE['GENERAL']['SUBHEADING']}]"
         )
-        raise typer.Exit()
+        return False
 
     console.print(
         f"\nOrigin Netuid: "
@@ -609,16 +516,19 @@ async def move_stake(
 
     # Slippage warning
     if prompt:
-        await display_stake_movement_cross_subnets(
-            subtensor=subtensor,
-            origin_netuid=origin_netuid,
-            destination_netuid=destination_netuid,
-            origin_hotkey=origin_hotkey,
-            destination_hotkey=destination_hotkey,
-            amount_to_move=amount_to_move_as_balance,
-        )
+        try:
+            await display_stake_movement_cross_subnets(
+                subtensor=subtensor,
+                origin_netuid=origin_netuid,
+                destination_netuid=destination_netuid,
+                origin_hotkey=origin_hotkey,
+                destination_hotkey=destination_hotkey,
+                amount_to_move=amount_to_move_as_balance,
+            )
+        except ValueError:
+            return False
         if not Confirm.ask("Would you like to continue?"):
-            raise typer.Exit()
+            return False
 
     # Perform moving operation.
     if not unlock_key(wallet).success:
@@ -699,6 +609,7 @@ async def transfer_stake(
     dest_netuid: int,
     dest_coldkey_ss58: str,
     interactive_selection: bool = False,
+    stake_all: bool = False,
     prompt: bool = True,
 ) -> bool:
     """Transfers stake from one network to another.
@@ -717,12 +628,13 @@ async def transfer_stake(
     Returns:
         bool: True if transfer was successful, False otherwise.
     """
-    origin_hotkey = origin_hotkey or wallet.hotkey.ss58_address
     if interactive_selection:
-        selection = await stake_transfer_selection(wallet, subtensor, origin_hotkey)
+        selection = await stake_move_transfer_selection(subtensor, wallet)
         origin_netuid = selection["origin_netuid"]
         amount = selection["amount"]
         dest_netuid = selection["destination_netuid"]
+        stake_all = selection["stake_all"]
+        origin_hotkey = selection["origin_hotkey"]
 
     # Check if both subnets exist
     block_hash = await subtensor.substrate.get_chain_head()
@@ -750,7 +662,22 @@ async def transfer_stake(
             hotkey_ss58=origin_hotkey,
             netuid=dest_netuid,
         )
-    amount_to_transfer = Balance.from_tao(amount).set_unit(origin_netuid)
+
+    if current_stake.tao == 0:
+        err_console.print(
+            f"[red]No stake found for hotkey: {origin_hotkey} on netuid: {origin_netuid}[/red]"
+        )
+        return False
+
+    amount_to_transfer = None
+    if amount:
+        amount_to_transfer = Balance.from_tao(amount).set_unit(origin_netuid)
+    elif stake_all:
+        amount_to_transfer = current_stake
+    else:
+        amount_to_transfer, _ = prompt_stake_amount(
+            current_stake, origin_netuid, "transfer"
+        )
 
     # Check if enough stake to transfer
     if amount_to_transfer > current_stake:
@@ -763,17 +690,20 @@ async def transfer_stake(
 
     # Slippage warning
     if prompt:
-        await display_stake_movement_cross_subnets(
-            subtensor=subtensor,
-            origin_netuid=origin_netuid,
-            destination_netuid=dest_netuid,
-            origin_hotkey=origin_hotkey,
-            destination_hotkey=origin_hotkey,
-            amount_to_move=amount_to_transfer,
-        )
+        try:
+            await display_stake_movement_cross_subnets(
+                subtensor=subtensor,
+                origin_netuid=origin_netuid,
+                destination_netuid=dest_netuid,
+                origin_hotkey=origin_hotkey,
+                destination_hotkey=origin_hotkey,
+                amount_to_move=amount_to_transfer,
+            )
+        except ValueError:
+            return False
 
         if not Confirm.ask("Would you like to continue?"):
-            raise typer.Exit()
+            return False
 
     # Perform transfer operation
     if not unlock_key(wallet).success:
@@ -868,7 +798,10 @@ async def swap_stake(
     """
     hotkey_ss58 = wallet.hotkey.ss58_address
     if interactive_selection:
-        selection = await stake_swap_selection(subtensor, wallet)
+        try:
+            selection = await stake_swap_selection(subtensor, wallet)
+        except ValueError:
+            return False
         origin_netuid = selection["origin_netuid"]
         amount = selection["amount"]
         destination_netuid = selection["destination_netuid"]
@@ -916,17 +849,20 @@ async def swap_stake(
 
     # Slippage warning
     if prompt:
-        await display_stake_movement_cross_subnets(
-            subtensor=subtensor,
-            origin_netuid=origin_netuid,
-            destination_netuid=destination_netuid,
-            origin_hotkey=hotkey_ss58,
-            destination_hotkey=hotkey_ss58,
-            amount_to_move=amount_to_swap,
-        )
+        try:
+            await display_stake_movement_cross_subnets(
+                subtensor=subtensor,
+                origin_netuid=origin_netuid,
+                destination_netuid=destination_netuid,
+                origin_hotkey=hotkey_ss58,
+                destination_hotkey=hotkey_ss58,
+                amount_to_move=amount_to_swap,
+            )
+        except ValueError:
+            return False
 
         if not Confirm.ask("Would you like to continue?"):
-            raise typer.Exit()
+            return False
 
     # Perform swap operation
     if not unlock_key(wallet).success:

bittensor_cli/src/commands/stake/remove.py

@@ -2,10 +2,8 @@ import asyncio
 from functools import partial
 
 from typing import TYPE_CHECKING, Optional
-import typer
 
 from bittensor_wallet import Wallet
-from bittensor_wallet.errors import KeyFileError
 from rich.prompt import Confirm, Prompt
 from rich.table import Table
 
@@ -67,13 +65,16 @@ async def unstake(
         all_sn_dynamic_info = {info.netuid: info for info in all_sn_dynamic_info_}
 
     if interactive:
-        hotkeys_to_unstake_from, unstake_all_from_hk = await _unstake_selection(
-            all_sn_dynamic_info,
-            ck_hk_identities,
-            old_identities,
-            stake_infos,
-            netuid=netuid,
-        )
+        try:
+            hotkeys_to_unstake_from, unstake_all_from_hk = await _unstake_selection(
+                all_sn_dynamic_info,
+                ck_hk_identities,
+                old_identities,
+                stake_infos,
+                netuid=netuid,
+            )
+        except ValueError:
+            return False
         if unstake_all_from_hk:
             hotkey_to_unstake_all = hotkeys_to_unstake_from[0]
             unstake_all_alpha = Confirm.ask(
@@ -266,7 +267,7 @@ async def unstake(
     _print_table_and_slippage(table, max_float_slippage, safe_staking)
     if prompt:
         if not Confirm.ask("Would you like to continue?"):
-            raise typer.Exit()
+            return False
 
     # Execute extrinsics
     if not unlock_key(wallet).success:
@@ -823,7 +824,7 @@ async def _unstake_selection(
 ):
     if not stake_infos:
         print_error("You have no stakes to unstake.")
-        raise typer.Exit()
+        raise ValueError
 
     hotkey_stakes = {}
     for stake_info in stake_infos:
@@ -840,7 +841,7 @@ async def _unstake_selection(
             print_error(f"You have no stakes to unstake in subnet {netuid}.")
         else:
             print_error("You have no stakes to unstake.")
-        raise typer.Exit()
+        raise ValueError
 
     hotkeys_info = []
     for idx, (hotkey_ss58, netuid_stakes) in enumerate(hotkey_stakes.items()):

bittensor_cli/src/commands/subnets/subnets.py

@@ -2,10 +2,8 @@ import asyncio
 import json
 import sqlite3
 from typing import TYPE_CHECKING, Optional, cast
-import typer
 
 from bittensor_wallet import Wallet
-from bittensor_wallet.errors import KeyFileError
 from rich.prompt import Confirm, Prompt
 from rich.console import Group
 from rich.progress import Progress, BarColumn, TextColumn
@@ -814,7 +812,7 @@ async def show(
         root_info = next((s for s in all_subnets if s.netuid == 0), None)
         if root_info is None:
             print_error("The root subnet does not exist")
-            raise typer.Exit()
+            return False
 
         root_state, identities, old_identities = await asyncio.gather(
             subtensor.get_subnet_state(netuid=0, block_hash=block_hash),
@@ -1017,7 +1015,7 @@ async def show(
     async def show_subnet(netuid_: int):
         if not await subtensor.subnet_exists(netuid=netuid):
             err_console.print(f"[red]Subnet {netuid} does not exist[/red]")
-            raise typer.Exit()
+            return False
         block_hash = await subtensor.substrate.get_chain_head()
         (
             subnet_info,
@@ -1036,15 +1034,15 @@ async def show(
         )
         if subnet_state is None:
             print_error(f"Subnet {netuid_} does not exist")
-            raise typer.Exit()
+            return False
 
         if subnet_info is None:
             print_error(f"Subnet {netuid_} does not exist")
-            raise typer.Exit()
+            return False
 
         if len(subnet_state.hotkeys) == 0:
             print_error(f"Subnet {netuid_} is currently empty with 0 UIDs registered.")
-            raise typer.Exit()
+            return False
 
         # Define table properties
         table = Table(
@@ -1381,7 +1379,7 @@ async def create(
                     " are you sure you wish to continue?"
                 ):
                     console.print(":cross_mark: Aborted!")
-                    raise typer.Exit()
+                    return False
 
             identity = prompt_for_identity(
                 current_identity=current_identity,
@@ -2135,7 +2133,7 @@ async def get_identity(subtensor: "SubtensorInterface", netuid: int, title: str
 
     if not await subtensor.subnet_exists(netuid):
         print_error(f"Subnet {netuid} does not exist.")
-        raise typer.Exit()
+        return None
 
     with console.status(
         ":satellite: [bold green]Querying subnet identity...", spinner="earth"

bittensor_cli/src/commands/sudo.py

@@ -1,7 +1,6 @@
 import asyncio
 from typing import TYPE_CHECKING, Union, Optional
 
-import typer
 from bittensor_wallet import Wallet
 from rich import box
 from rich.table import Column, Table
@@ -593,7 +592,7 @@ async def sudo_set_hyperparameter(
     if success:
         console.print("\n")
         print_verbose("Fetching hyperparameters")
-        await get_hyperparameters(subtensor, netuid=netuid)
+        return await get_hyperparameters(subtensor, netuid=netuid)
 
 
 async def get_hyperparameters(subtensor: "SubtensorInterface", netuid: int):
@@ -606,7 +605,7 @@ async def get_hyperparameters(subtensor: "SubtensorInterface", netuid: int):
     subnet_info = await subtensor.subnet(netuid)
     if subnet_info is None:
         print_error(f"Subnet with netuid {netuid} does not exist.")
-        raise typer.Exit()
+        return False
 
     table = Table(
         Column("[white]HYPERPARAMETER", style=COLOR_PALETTE["SUDO"]["HYPERPARAMETER"]),