More stake commands.

Author: thewhaleking

bittensor_cli/cli.py

@@ -2,6 +2,7 @@
 import asyncio
 import curses
 import importlib
+import json
 import os.path
 import re
 import ssl
@@ -3460,6 +3461,7 @@ def stake_move(
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Move staked TAO between hotkeys while keeping the same coldkey ownership.
@@ -3481,13 +3483,14 @@ def stake_move(
 
         [green]$[/green] btcli stake move
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         console.print(
             "[dim]This command moves stake from one hotkey to another hotkey while keeping the same coldkey.[/dim]"
         )
         if not destination_hotkey:
             dest_wallet_or_ss58 = Prompt.ask(
-                "Enter the [blue]destination wallet[/blue] where destination hotkey is located or [blue]ss58 address[/blue]"
+                "Enter the [blue]destination wallet[/blue] where destination hotkey is located or "
+                "[blue]ss58 address[/blue]"
             )
             if is_valid_ss58_address(dest_wallet_or_ss58):
                 destination_hotkey = dest_wallet_or_ss58
@@ -3574,7 +3577,7 @@ def stake_move(
                     "Enter the [blue]destination subnet[/blue] (netuid) to move stake to"
                 )
 
-        return self._run_command(
+        result = self._run_command(
             move_stake.move_stake(
                 subtensor=self.initialize_chain(network),
                 wallet=wallet,
@@ -3588,6 +3591,9 @@ def stake_move(
                 prompt=prompt,
             )
         )
+        if json_output:
+            json_console.print(json.dumps({"success": result}))
+        return result
 
     def stake_transfer(
         self,
@@ -3624,6 +3630,7 @@ def stake_transfer(
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Transfer stake between coldkeys while keeping the same hotkey ownership.
@@ -3657,10 +3664,10 @@ def stake_transfer(
         Transfer all available stake from origin hotkey:
         [green]$[/green] btcli stake transfer --all --origin-netuid 1 --dest-netuid 2
         """
+        self.verbosity_handler(quiet, verbose, json_output)
         console.print(
             "[dim]This command transfers stake from one coldkey to another while keeping the same hotkey.[/dim]"
         )
-        self.verbosity_handler(quiet, verbose)
 
         if not dest_ss58:
             dest_ss58 = Prompt.ask(
@@ -3732,7 +3739,7 @@ def stake_transfer(
                     "Enter the [blue]destination subnet[/blue] (netuid)"
                 )
 
-        return self._run_command(
+        result = self._run_command(
             move_stake.transfer_stake(
                 wallet=wallet,
                 subtensor=self.initialize_chain(network),
@@ -3746,6 +3753,9 @@ def stake_transfer(
                 prompt=prompt,
             )
         )
+        if json_output:
+            json_console.print(json.dumps({"success": result}))
+        return result
 
     def stake_swap(
         self,
@@ -3784,6 +3794,7 @@ def stake_swap(
         wait_for_finalization: bool = Options.wait_for_finalization,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Swap stake between different subnets while keeping the same coldkey-hotkey pair ownership.
@@ -3805,10 +3816,10 @@ def stake_swap(
         Swap 100 TAO from subnet 1 to subnet 2:
         [green]$[/green] btcli stake swap --wallet-name default --wallet-hotkey default --origin-netuid 1 --dest-netuid 2 --amount 100
         """
+        self.verbosity_handler(quiet, verbose, json_output)
         console.print(
             "[dim]This command moves stake from one subnet to another subnet while keeping the same coldkey-hotkey pair.[/dim]"
         )
-        self.verbosity_handler(quiet, verbose)
 
         wallet = self.wallet_ask(
             wallet_name,
@@ -3833,7 +3844,7 @@ def stake_swap(
             if not amount and not swap_all:
                 amount = FloatPrompt.ask("Enter the [blue]amount[/blue] to swap")
 
-        return self._run_command(
+        result = self._run_command(
             move_stake.swap_stake(
                 wallet=wallet,
                 subtensor=self.initialize_chain(network),
@@ -3847,6 +3858,9 @@ def stake_swap(
                 wait_for_finalization=wait_for_finalization,
             )
         )
+        if json_output:
+            json_console.print(json.dumps({"success": result}))
+        return result
 
     def stake_get_children(
         self,
@@ -3868,6 +3882,7 @@ def stake_get_children(
         ),
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Get all the child hotkeys on a specified subnet.
@@ -3879,7 +3894,7 @@ def stake_get_children(
         [green]$[/green] btcli stake child get --netuid 1
         [green]$[/green] btcli stake child get --all-netuids
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -3900,11 +3915,14 @@ def stake_get_children(
                 "Enter a netuid (leave blank for all)", default=None, show_default=True
             )
 
-        return self._run_command(
+        result = self._run_command(
             children_hotkeys.get_children(
                 wallet, self.initialize_chain(network), netuid
             )
         )
+        if json_output:
+            json_console.print(json.dumps(result))
+        return result
 
     def stake_set_children(
         self,

bittensor_cli/src/commands/stake/move.py

@@ -442,7 +442,7 @@ async def move_stake(
     stake_all: bool,
     interactive_selection: bool = False,
     prompt: bool = True,
-):
+) -> bool:
     if interactive_selection:
         try:
             selection = await stake_move_transfer_selection(subtensor, wallet)
@@ -509,8 +509,10 @@ async def move_stake(
     if amount_to_move_as_balance > origin_stake_balance:
         err_console.print(
             f"[red]Not enough stake[/red]:\n"
-            f" Stake balance: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{origin_stake_balance}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
-            f" < Moving amount: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{amount_to_move_as_balance}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
+            f" Stake balance: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
+            f"{origin_stake_balance}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
+            f" < Moving amount: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
+            f"{amount_to_move_as_balance}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
         )
         return False
 
@@ -559,13 +561,12 @@ async def move_stake(
         console.print(":white_heavy_check_mark: [green]Sent[/green]")
         return True
     else:
-        await response.process_events()
         if not await response.is_success:
             err_console.print(
                 f"\n:cross_mark: [red]Failed[/red] with error:"
                 f" {format_error_message(await response.error_message)}"
             )
-            return
+            return False
         else:
             console.print(
                 ":white_heavy_check_mark: [dark_sea_green3]Stake moved.[/dark_sea_green3]"
@@ -597,7 +598,7 @@ async def move_stake(
                 f"Destination Stake:\n  [blue]{destination_stake_balance}[/blue] :arrow_right: "
                 f"[{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{new_destination_stake_balance}"
             )
-            return
+            return True
 
 
 async def transfer_stake(
@@ -734,7 +735,6 @@ async def transfer_stake(
         console.print(":white_heavy_check_mark: [green]Sent[/green]")
         return True
 
-    await response.process_events()
     if not await response.is_success:
         err_console.print(
             f":cross_mark: [red]Failed[/red] with error: "
@@ -869,7 +869,8 @@ async def swap_stake(
         return False
 
     with console.status(
-        f"\n:satellite: Swapping stake from netuid [blue]{origin_netuid}[/blue] to netuid [blue]{destination_netuid}[/blue]..."
+        f"\n:satellite: Swapping stake from netuid [blue]{origin_netuid}[/blue] "
+        f"to netuid [blue]{destination_netuid}[/blue]..."
     ):
         call = await subtensor.substrate.compose_call(
             call_module="SubtensorModule",
@@ -896,7 +897,6 @@ async def swap_stake(
         console.print(":white_heavy_check_mark: [green]Sent[/green]")
         return True
 
-    await response.process_events()
     if not await response.is_success:
         err_console.print(
             f":cross_mark: [red]Failed[/red] with error: "

bittensor_cli/src/commands/stake/remove.py

@@ -46,7 +46,6 @@ async def unstake(
     json_output: bool,
 ):
     """Unstake from hotkey(s)."""
-    unstake_all_from_hk = False
     with console.status(
         f"Retrieving subnet data & identities from {subtensor.network}...",
         spinner="earth",