bittensor-cli 9.2.0__py3-none-any.whl → 9.3.0__py3-none-any.whl

bittensor_cli/cli.py

@@ -2,6 +2,7 @@
 import asyncio
 import curses
 import importlib
+import json
 import os.path
 import re
 import ssl
@@ -14,11 +15,19 @@ from dataclasses import fields
 import rich
 import typer
 import numpy as np
+from async_substrate_interface.errors import (
+    SubstrateRequestException,
+    ConnectionClosed,
+    InvalidHandshake,
+)
 from bittensor_wallet import Wallet
 from rich import box
 from rich.prompt import Confirm, FloatPrompt, Prompt, IntPrompt
 from rich.table import Column, Table
 from rich.tree import Tree
+from typing_extensions import Annotated
+from yaml import safe_dump, safe_load
+
 from bittensor_cli.src import (
     defaults,
     HELP_PANELS,
@@ -31,7 +40,6 @@ from bittensor_cli.src import (
 from bittensor_cli.version import __version__, __version_as_int__
 from bittensor_cli.src.bittensor import utils
 from bittensor_cli.src.bittensor.balances import Balance
-from async_substrate_interface.errors import SubstrateRequestException
 from bittensor_cli.src.commands import sudo, wallets, view
 from bittensor_cli.src.commands import weights as weights_cmds
 from bittensor_cli.src.commands.subnets import price, subnets
@@ -48,6 +56,7 @@ from bittensor_cli.src.bittensor.utils import (
     console,
     err_console,
     verbose_console,
+    json_console,
     is_valid_ss58_address,
     print_error,
     validate_chain_endpoint,
@@ -61,9 +70,6 @@ from bittensor_cli.src.bittensor.utils import (
     is_linux,
     validate_rate_tolerance,
 )
-from typing_extensions import Annotated
-from websockets import ConnectionClosed, InvalidHandshake
-from yaml import safe_dump, safe_load
 
 try:
     from git import Repo, GitError
@@ -109,6 +115,17 @@ class Options:
         "--wallet.hotkey",
         help="Hotkey of the wallet",
     )
+    wallet_ss58_address = typer.Option(
+        None,
+        "--wallet-name",
+        "--name",
+        "--wallet_name",
+        "--wallet.name",
+        "--address",
+        "--ss58",
+        "--ss58-address",
+        help="SS58 address or wallet name to check. Leave empty to be prompted.",
+    )
     wallet_hotkey_ss58 = typer.Option(
         None,
         "--hotkey",
@@ -268,6 +285,15 @@ class Options:
         "--dashboard.path",
         help="Path to save the dashboard HTML file. For example: `~/.bittensor/dashboard`.",
     )
+    json_output = typer.Option(
+        False,
+        "--json-output",
+        "--json-out",
+        help="Outputs the result of the command as JSON.",
+    )
+    era: int = typer.Option(
+        3, help="Length (in blocks) for which the transaction should be valid."
+    )
 
 
 def list_prompt(init_var: list, list_type: type, help_text: str) -> list:
@@ -313,22 +339,31 @@ def verbosity_console_handler(verbosity_level: int = 1) -> None:
     :param verbosity_level: int corresponding to verbosity level of console output (0 is quiet, 1 is normal, 2 is
         verbose)
     """
-    if verbosity_level not in range(3):
+    if verbosity_level not in range(4):
         raise ValueError(
-            f"Invalid verbosity level: {verbosity_level}. Must be one of: 0 (quiet), 1 (normal), 2 (verbose)"
+            f"Invalid verbosity level: {verbosity_level}. "
+            f"Must be one of: 0 (quiet + json output), 1 (normal), 2 (verbose), 3 (json output + verbose)"
         )
     if verbosity_level == 0:
         console.quiet = True
         err_console.quiet = True
         verbose_console.quiet = True
+        json_console.quiet = False
     elif verbosity_level == 1:
         console.quiet = False
         err_console.quiet = False
         verbose_console.quiet = True
+        json_console.quiet = True
     elif verbosity_level == 2:
         console.quiet = False
         err_console.quiet = False
         verbose_console.quiet = False
+        json_console.quiet = True
+    elif verbosity_level == 3:
+        console.quiet = True
+        err_console.quiet = True
+        verbose_console.quiet = False
+        json_console.quiet = False
 
 
 def get_optional_netuid(netuid: Optional[int], all_netuids: bool) -> Optional[int]:
@@ -684,6 +719,12 @@ class CLIManager:
         self.wallet_app.command(
             "swap-hotkey", rich_help_panel=HELP_PANELS["WALLET"]["SECURITY"]
         )(self.wallet_swap_hotkey)
+        self.wallet_app.command(
+            "swap-coldkey", rich_help_panel=HELP_PANELS["WALLET"]["SECURITY"]
+        )(self.wallet_swap_coldkey)
+        self.wallet_app.command(
+            "swap-check", rich_help_panel=HELP_PANELS["WALLET"]["SECURITY"]
+        )(self.wallet_check_ck_swap)
         self.wallet_app.command(
             "regen-coldkey", rich_help_panel=HELP_PANELS["WALLET"]["SECURITY"]
         )(self.wallet_regen_coldkey)
@@ -699,6 +740,9 @@ class CLIManager:
         self.wallet_app.command(
             "new-coldkey", rich_help_panel=HELP_PANELS["WALLET"]["MANAGEMENT"]
         )(self.wallet_new_coldkey)
+        self.wallet_app.command(
+            "associate-hotkey", rich_help_panel=HELP_PANELS["WALLET"]["MANAGEMENT"]
+        )(self.wallet_associate_hotkey)
         self.wallet_app.command(
             "create", rich_help_panel=HELP_PANELS["WALLET"]["MANAGEMENT"]
         )(self.wallet_create_wallet)
@@ -934,6 +978,7 @@ class CLIManager:
         """
         if not self.subtensor:
             if network:
+                network_ = None
                 for item in network:
                     if item.startswith("ws"):
                         network_ = item
@@ -1068,12 +1113,15 @@ class CLIManager:
             except ModuleNotFoundError:
                 self.asyncio_runner = asyncio.run
 
-    def verbosity_handler(self, quiet: bool, verbose: bool):
+    def verbosity_handler(
+        self, quiet: bool, verbose: bool, json_output: bool = False
+    ) -> None:
         if quiet and verbose:
             err_console.print("Cannot specify both `--quiet` and `--verbose`")
             raise typer.Exit()
-
-        if quiet:
+        if json_output and verbose:
+            verbosity_console_handler(3)
+        elif json_output or quiet:
             verbosity_console_handler(0)
         elif verbose:
             verbosity_console_handler(2)
@@ -1203,7 +1251,8 @@ class CLIManager:
             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%)",
+                        f"What percentage would you like to set for [red]{arg}[/red]?\n"
+                        f"Values are percentages (e.g. 0.05 for 5%)",
                         default=0.05,
                     )
                     try:
@@ -1503,7 +1552,7 @@ class CLIManager:
         wallet_name: Optional[str],
         wallet_path: Optional[str],
         wallet_hotkey: Optional[str],
-        ask_for: list[str] = [],
+        ask_for: Optional[list[str]] = None,
         validate: WV = WV.WALLET,
     ) -> Wallet:
         """
@@ -1512,9 +1561,10 @@ class CLIManager:
         :param wallet_path: root path of the wallets
         :param wallet_hotkey: name of the wallet hotkey file
         :param validate: flag whether to check for the wallet's validity
-        :param ask_type: aspect of the wallet (name, path, hotkey) to prompt the user for
+        :param ask_for: aspect of the wallet (name, path, hotkey) to prompt the user for
         :return: created Wallet object
         """
+        ask_for = ask_for or []
         # Prompt for missing attributes specified in ask_for
         if WO.NAME in ask_for and not wallet_name:
             if self.config.get("wallet_name"):
@@ -1587,6 +1637,7 @@ class CLIManager:
         wallet_path: str = Options.wallet_path,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Displays all the wallets and their corresponding hotkeys that are located in the wallet path specified in the config.
@@ -1602,11 +1653,11 @@ class CLIManager:
 
         [bold]NOTE[/bold]: This command is read-only and does not modify the filesystem or the blockchain state. It is intended for use with the Bittensor CLI to provide a quick overview of the user's wallets.
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         wallet = self.wallet_ask(
             None, wallet_path, None, ask_for=[WO.PATH], validate=WV.NONE
         )
-        return self._run_command(wallets.wallet_list(wallet.path))
+        return self._run_command(wallets.wallet_list(wallet.path, json_output))
 
     def wallet_overview(
         self,
@@ -1646,6 +1697,7 @@ class CLIManager:
         network: Optional[list[str]] = Options.network,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Displays a detailed overview of the user's registered accounts on the Bittensor network.
@@ -1662,7 +1714,7 @@ class CLIManager:
         It provides a quick and comprehensive view of the user's network presence, making it useful for monitoring account status,
         stake distribution, and overall contribution to the Bittensor network.
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         if include_hotkeys and exclude_hotkeys:
             utils.err_console.print(
                 "[red]You have specified both the inclusion and exclusion options. Only one of these options is allowed currently."
@@ -1707,6 +1759,7 @@ class CLIManager:
                 exclude_hotkeys,
                 netuids_filter=netuids,
                 verbose=verbose,
+                json_output=json_output,
             )
         )
 
@@ -1729,6 +1782,7 @@ class CLIManager:
         transfer_all: bool = typer.Option(
             False, "--all", prompt=False, help="Transfer all available balance."
         ),
+        era: int = Options.era,
         wallet_name: str = Options.wallet_name,
         wallet_path: str = Options.wallet_path,
         wallet_hotkey: str = Options.wallet_hotkey,
@@ -1736,6 +1790,7 @@ class CLIManager:
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Send TAO tokens from one wallet to another wallet on the Bittensor network.
@@ -1759,7 +1814,7 @@ class CLIManager:
             print_error("You have entered an incorrect ss58 address. Please try again.")
             raise typer.Exit()
 
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -1777,12 +1832,14 @@ class CLIManager:
             amount = FloatPrompt.ask("Enter amount (in TAO) to transfer.")
         return self._run_command(
             wallets.transfer(
-                wallet,
-                subtensor,
-                destination_ss58_address,
-                amount,
-                transfer_all,
-                prompt,
+                wallet=wallet,
+                subtensor=subtensor,
+                destination=destination_ss58_address,
+                amount=amount,
+                transfer_all=transfer_all,
+                era=era,
+                prompt=prompt,
+                json_output=json_output,
             )
         )
 
@@ -1798,6 +1855,7 @@ class CLIManager:
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
         prompt: bool = Options.prompt,
+        json_output: bool = Options.json_output,
     ):
         """
         Swap hotkeys of a given wallet on the blockchain. For a registered key pair, for example, a (coldkeyA, hotkeyA) pair, this command swaps the hotkeyA with a new, unregistered, hotkeyB to move the original registration to the (coldkeyA, hotkeyB) pair.
@@ -1816,7 +1874,7 @@ class CLIManager:
 
         [green]$[/green] btcli wallet swap_hotkey destination_hotkey_name --wallet-name your_wallet_name --wallet-hotkey original_hotkey
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         original_wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -1838,7 +1896,9 @@ class CLIManager:
         )
         self.initialize_chain(network)
         return self._run_command(
-            wallets.swap_hotkey(original_wallet, new_wallet, self.subtensor, prompt)
+            wallets.swap_hotkey(
+                original_wallet, new_wallet, self.subtensor, prompt, json_output
+            )
         )
 
     def wallet_inspect(
@@ -1857,6 +1917,7 @@ class CLIManager:
         netuids: str = Options.netuids,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Displays the details of the user's wallet pairs (coldkey, hotkey) on the Bittensor network.
@@ -1891,7 +1952,7 @@ class CLIManager:
         """
         print_error("This command is disabled on the 'rao' network.")
         raise typer.Exit()
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
 
         if netuids:
             netuids = parse_to_list(
@@ -1988,6 +2049,7 @@ class CLIManager:
 
         [bold]Note[/bold]: This command is meant for used in local environments where users can experiment with the blockchain without using real TAO tokens. Users must have the necessary hardware setup, especially when opting for CUDA-based GPU calculations. It is currently disabled on testnet and mainnet (finney). You can only use this command on a local blockchain.
         """
+        # TODO should we add json_output?
         wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -2024,6 +2086,7 @@ class CLIManager:
         overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Regenerate a coldkey for a wallet on the Bittensor blockchain network.
@@ -2041,7 +2104,7 @@ class CLIManager:
 
         [bold]Note[/bold]: This command is critical for users who need to regenerate their coldkey either for recovery or for security reasons.
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
 
         if not wallet_path:
             wallet_path = Prompt.ask(
@@ -2069,6 +2132,7 @@ class CLIManager:
                 json_password,
                 use_password,
                 overwrite,
+                json_output,
             )
         )
 
@@ -2082,6 +2146,7 @@ class CLIManager:
         overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Regenerates the public part of a coldkey (coldkeypub.txt) for a wallet.
@@ -2098,7 +2163,7 @@ class CLIManager:
 
         [bold]Note[/bold]: This command is particularly useful for users who need to regenerate their coldkeypub, perhaps due to file corruption or loss. You will need either ss58 address or public hex key from your old coldkeypub.txt for the wallet. It is a recovery-focused utility that ensures continued access to your wallet functionalities.
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
 
         if not wallet_path:
             wallet_path = Prompt.ask(
@@ -2127,7 +2192,9 @@ 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, overwrite)
+            wallets.regen_coldkey_pub(
+                wallet, ss58_address, public_key_hex, overwrite, json_output
+            )
         )
 
     def wallet_regen_hotkey(
@@ -2146,6 +2213,7 @@ class CLIManager:
         overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Regenerates a hotkey for a wallet.
@@ -2164,7 +2232,7 @@ class CLIManager:
         [bold]Note[/bold]: This command is essential for users who need to regenerate their hotkey, possibly for security upgrades or key recovery.
         It should be used with caution to avoid accidental overwriting of existing keys.
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -2184,6 +2252,7 @@ class CLIManager:
                 json_password,
                 use_password,
                 overwrite,
+                json_output,
             )
         )
 
@@ -2206,6 +2275,7 @@ class CLIManager:
         overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Create a new hotkey for a wallet.
@@ -2221,7 +2291,7 @@ class CLIManager:
 
         [italic]Note[/italic]: This command is useful to create additional hotkeys for different purposes, such as running multiple subnet miners or subnet validators or separating operational roles within the Bittensor network.
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
 
         if not wallet_name:
             wallet_name = Prompt.ask(
@@ -2245,7 +2315,77 @@ class CLIManager:
         if not uri:
             n_words = get_n_words(n_words)
         return self._run_command(
-            wallets.new_hotkey(wallet, n_words, use_password, uri, overwrite)
+            wallets.new_hotkey(
+                wallet, n_words, use_password, uri, overwrite, json_output
+            )
+        )
+
+    def wallet_associate_hotkey(
+        self,
+        wallet_name: Optional[str] = Options.wallet_name,
+        wallet_path: Optional[str] = Options.wallet_path,
+        wallet_hotkey: Optional[str] = Options.wallet_hotkey_ss58,
+        network: Optional[list[str]] = Options.network,
+        prompt: bool = Options.prompt,
+        quiet: bool = Options.quiet,
+        verbose: bool = Options.verbose,
+    ):
+        """
+        Associate a hotkey with a wallet(coldkey).
+
+        USAGE
+
+        This command is used to associate a hotkey with a wallet(coldkey).
+
+        EXAMPLE
+
+        [green]$[/green] btcli wallet associate-hotkey --hotkey-name hotkey_name
+        [green]$[/green] btcli wallet associate-hotkey --hotkey-ss58 5DkQ4...
+        """
+        self.verbosity_handler(quiet, verbose)
+        if not wallet_name:
+            wallet_name = Prompt.ask(
+                "Enter the [blue]wallet name[/blue] [dim](which you want to associate with the hotkey)[/dim]",
+                default=self.config.get("wallet_name") or defaults.wallet.name,
+            )
+        if not wallet_hotkey:
+            wallet_hotkey = Prompt.ask(
+                "Enter the [blue]hotkey[/blue] name or "
+                "[blue]hotkey ss58 address[/blue] [dim](to associate with your coldkey)[/dim]"
+            )
+
+        hotkey_display = None
+        if is_valid_ss58_address(wallet_hotkey):
+            hotkey_ss58 = wallet_hotkey
+            wallet = self.wallet_ask(
+                wallet_name,
+                wallet_path,
+                None,
+                ask_for=[WO.NAME, WO.PATH],
+                validate=WV.WALLET,
+            )
+            hotkey_display = (
+                f"hotkey [{COLORS.GENERAL.HK}]{hotkey_ss58}[/{COLORS.GENERAL.HK}]"
+            )
+        else:
+            wallet = self.wallet_ask(
+                wallet_name,
+                wallet_path,
+                wallet_hotkey,
+                ask_for=[WO.NAME, WO.PATH, WO.HOTKEY],
+                validate=WV.WALLET_AND_HOTKEY,
+            )
+            hotkey_ss58 = wallet.hotkey.ss58_address
+            hotkey_display = f"hotkey [blue]{wallet_hotkey}[/blue] [{COLORS.GENERAL.HK}]({hotkey_ss58})[/{COLORS.GENERAL.HK}]"
+
+        return self._run_command(
+            wallets.associate_hotkey(
+                wallet,
+                self.initialize_chain(network),
+                hotkey_ss58,
+                hotkey_display,
+                prompt,
+            )
         )
 
     def wallet_new_coldkey(
@@ -2264,6 +2404,7 @@ class CLIManager:
         overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Create a new coldkey. A coldkey is required for holding TAO balances and performing high-value transactions.
@@ -2278,7 +2419,7 @@ class CLIManager:
 
         [bold]Note[/bold]: This command is crucial for users who need to create a new coldkey for enhanced security or as part of setting up a new wallet. It is a foundational step in establishing a secure presence on the Bittensor network.
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
 
         if not wallet_path:
             wallet_path = Prompt.ask(
@@ -2301,33 +2442,100 @@ class CLIManager:
         if not uri:
             n_words = get_n_words(n_words)
         return self._run_command(
-            wallets.new_coldkey(wallet, n_words, use_password, uri, overwrite)
+            wallets.new_coldkey(
+                wallet, n_words, use_password, uri, overwrite, json_output
+            )
         )
 
     def wallet_check_ck_swap(
         self,
-        wallet_name: Optional[str] = Options.wallet_name,
+        wallet_ss58_address: Optional[str] = Options.wallet_ss58_address,
         wallet_path: Optional[str] = Options.wallet_path,
         wallet_hotkey: Optional[str] = Options.wallet_hotkey,
+        scheduled_block: Optional[int] = typer.Option(
+            None,
+            "--block",
+            help="Block number where the swap was scheduled",
+        ),
+        show_all: bool = typer.Option(
+            False,
+            "--all",
+            "-a",
+            help="Show all pending coldkey swaps",
+        ),
         network: Optional[list[str]] = Options.network,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
     ):
         """
-        Check the status of your scheduled coldkey swap.
+        Check the status of scheduled coldkey swaps.
 
         USAGE
 
-        Users should provide the old coldkey wallet to check the swap status.
+        This command can be used in three ways:
+        1. Show all pending swaps (--all)
+        2. Check status of a specific wallet's swap or SS58 address
+        3. Check detailed swap status with block number (--block)
 
-        EXAMPLE
+        EXAMPLES
+
+        Show all pending swaps:
+        [green]$[/green] btcli wallet swap-check --all
 
-        [green]$[/green] btcli wallet check_coldkey_swap
+        Check specific wallet's swap:
+        [green]$[/green] btcli wallet swap-check --wallet-name my_wallet
+
+        Check swap using SS58 address:
+        [green]$[/green] btcli wallet swap-check --ss58 5DkQ4...
+
+        Check swap details with block number:
+        [green]$[/green] btcli wallet swap-check --wallet-name my_wallet --block 12345
         """
+        # TODO add json_output if this ever gets used again (doubtful)
         self.verbosity_handler(quiet, verbose)
-        wallet = self.wallet_ask(wallet_name, wallet_path, wallet_hotkey)
         self.initialize_chain(network)
-        return self._run_command(wallets.check_coldkey_swap(wallet, self.subtensor))
+
+        if show_all:
+            return self._run_command(
+                wallets.check_swap_status(self.subtensor, None, None)
+            )
+
+        if not wallet_ss58_address:
+            wallet_ss58_address = Prompt.ask(
+                "Enter [blue]wallet name[/blue] or [blue]SS58 address[/blue] [dim](leave blank to show all pending swaps)[/dim]"
+            )
+            if not wallet_ss58_address:
+                return self._run_command(
+                    wallets.check_swap_status(self.subtensor, None, None)
+                )
+
+        if is_valid_ss58_address(wallet_ss58_address):
+            ss58_address = wallet_ss58_address
+        else:
+            wallet = self.wallet_ask(
+                wallet_ss58_address,
+                wallet_path,
+                wallet_hotkey,
+                ask_for=[WO.NAME, WO.PATH],
+                validate=WV.WALLET,
+            )
+            ss58_address = wallet.coldkeypub.ss58_address
+
+        if not scheduled_block:
+            block_input = Prompt.ask(
+                "[blue]Enter the block number[/blue] where the swap was scheduled [dim](optional, press enter to skip)[/dim]",
+                default="",
+            )
+            if block_input:
+                try:
+                    scheduled_block = int(block_input)
+                except ValueError:
+                    print_error("Invalid block number")
+                    raise typer.Exit()
+
+        return self._run_command(
+            wallets.check_swap_status(self.subtensor, ss58_address, scheduled_block)
+        )
 
     def wallet_create_wallet(
         self,
@@ -2340,6 +2548,7 @@ class CLIManager:
         overwrite: bool = Options.overwrite,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Create a complete wallet by setting up both coldkey and hotkeys.
@@ -2354,6 +2563,7 @@ class CLIManager:
 
         [bold]Note[/bold]: This command is for new users setting up their wallet for the first time, or for those who wish to completely renew their wallet keys. It ensures a fresh start with new keys for secure and effective participation in the Bittensor network.
         """
+        self.verbosity_handler(quiet, verbose, json_output)
         if not wallet_path:
             wallet_path = Prompt.ask(
                 "Enter the path of wallets directory", default=defaults.wallet.path
@@ -2370,7 +2580,6 @@ class CLIManager:
                 default=defaults.wallet.hotkey,
             )
 
-        self.verbosity_handler(quiet, verbose)
         wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -2381,7 +2590,9 @@ class CLIManager:
         if not uri:
             n_words = get_n_words(n_words)
         return self._run_command(
-            wallets.wallet_create(wallet, n_words, use_password, uri, overwrite)
+            wallets.wallet_create(
+                wallet, n_words, use_password, uri, overwrite, json_output
+            )
         )
 
     def wallet_balance(
@@ -2399,6 +2610,7 @@ class CLIManager:
         network: Optional[list[str]] = Options.network,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Check the balance of the wallet. This command shows a detailed view of the wallet's coldkey balances, including free and staked balances.
@@ -2424,7 +2636,7 @@ class CLIManager:
             [green]$[/green] btcli w balance --ss58 <ss58_address> --ss58 <ss58_address>
 
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         wallet = None
         if all_balances:
             ask_for = [WO.PATH]
@@ -2487,7 +2699,9 @@ class CLIManager:
                 )
         subtensor = self.initialize_chain(network)
         return self._run_command(
-            wallets.wallet_balance(wallet, subtensor, all_balances, ss58_addresses)
+            wallets.wallet_balance(
+                wallet, subtensor, all_balances, ss58_addresses, json_output
+            )
         )
 
     def wallet_history(
@@ -2511,6 +2725,7 @@ class CLIManager:
 
         """
         # TODO: Fetch effective network and redirect users accordingly - this only works on finney
+        # TODO: Add json_output if this gets re-enabled
         # no_use_config_str = "Using the network [dark_orange]finney[/dark_orange] and ignoring network/chain configs"
 
         # if self.config.get("network"):
@@ -2577,6 +2792,7 @@ class CLIManager:
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
         prompt: bool = Options.prompt,
+        json_output: bool = Options.json_output,
     ):
         """
         Create or update the on-chain identity of a coldkey or a hotkey on the Bittensor network. [bold]Incurs a 1 TAO transaction fee.[/bold]
@@ -2595,7 +2811,7 @@ class CLIManager:
 
         [bold]Note[/bold]: This command should only be used if the user is willing to incur the a recycle fee associated with setting an identity on the blockchain. It is a high-level command that makes changes to the blockchain state and should not be used programmatically as part of other scripts or applications.
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -2644,6 +2860,7 @@ class CLIManager:
                 identity["additional"],
                 identity["github_repo"],
                 prompt,
+                json_output,
             )
         )
 
@@ -2665,6 +2882,7 @@ class CLIManager:
         network: Optional[list[str]] = Options.network,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Shows the identity details of a user's coldkey or hotkey.
@@ -2683,7 +2901,7 @@ class CLIManager:
 
         [bold]Note[/bold]: This command is primarily used for informational purposes and has no side effects on the blockchain network state.
         """
-        wallet = None
+        self.verbosity_handler(quiet, verbose, json_output)
         if not wallet_name:
             if coldkey_ss58:
                 if not is_valid_ss58_address(coldkey_ss58):
@@ -2708,9 +2926,8 @@ class CLIManager:
             )
             coldkey_ss58 = wallet.coldkeypub.ss58_address
 
-        self.verbosity_handler(quiet, verbose)
         return self._run_command(
-            wallets.get_id(self.initialize_chain(network), coldkey_ss58)
+            wallets.get_id(self.initialize_chain(network), coldkey_ss58, json_output)
         )
 
     def wallet_sign(
@@ -2726,6 +2943,7 @@ class CLIManager:
         message: str = typer.Option("", help="The message to encode and sign"),
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Allows users to sign a message with the provided wallet or wallet hotkey. Use this command to easily prove your ownership of a coldkey or a hotkey.
@@ -2741,7 +2959,7 @@ class CLIManager:
         [green]$[/green] btcli wallet sign --wallet-name default --wallet-hotkey hotkey --message
         '{"something": "here", "timestamp": 1719908486}'
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         if use_hotkey is None:
             use_hotkey = Confirm.ask(
                 f"Would you like to sign the transaction using your [{COLORS.G.HK}]hotkey[/{COLORS.G.HK}]?"
@@ -2760,7 +2978,92 @@ class CLIManager:
         if not message:
             message = Prompt.ask("Enter the [blue]message[/blue] to encode and sign")
 
-        return self._run_command(wallets.sign(wallet, message, use_hotkey))
+        return self._run_command(wallets.sign(wallet, message, use_hotkey, json_output))
+
+    def wallet_swap_coldkey(
+        self,
+        wallet_name: Optional[str] = Options.wallet_name,
+        wallet_path: Optional[str] = Options.wallet_path,
+        wallet_hotkey: Optional[str] = Options.wallet_hotkey,
+        new_wallet_or_ss58: Optional[str] = typer.Option(
+            None,
+            "--new-coldkey",
+            "--new-coldkey-ss58",
+            "--new-wallet",
+            "--new",
+            help="SS58 address of the new coldkey that will replace the current one.",
+        ),
+        network: Optional[list[str]] = Options.network,
+        quiet: bool = Options.quiet,
+        verbose: bool = Options.verbose,
+        force_swap: bool = typer.Option(
+            False,
+            "--force",
+            "-f",
+            "--force-swap",
+            help="Force the swap even if the new coldkey is already scheduled for a swap.",
+        ),
+    ):
+        """
+        Schedule a coldkey swap for a wallet.
+
+        This command allows you to schedule a coldkey swap for a wallet. You can either provide a new wallet name, or SS58 address.
+
+        EXAMPLES
+
+        [green]$[/green] btcli wallet schedule-coldkey-swap --new-wallet my_new_wallet
+
+        [green]$[/green] btcli wallet schedule-coldkey-swap --new-coldkey-ss58 5Dk...X3q
+        """
+        self.verbosity_handler(quiet, verbose)
+
+        if not wallet_name:
+            wallet_name = Prompt.ask(
+                "Enter the [blue]wallet name[/blue] which you want to swap the coldkey for",
+                default=self.config.get("wallet_name") or defaults.wallet.name,
+            )
+        wallet = self.wallet_ask(
+            wallet_name,
+            wallet_path,
+            wallet_hotkey,
+            ask_for=[WO.NAME],
+            validate=WV.WALLET,
+        )
+        console.print(
+            f"\nWallet selected to swap the [blue]coldkey[/blue] from: \n"
+            f"[dark_sea_green3]{wallet}[/dark_sea_green3]\n"
+        )
+
+        if not new_wallet_or_ss58:
+            new_wallet_or_ss58 = Prompt.ask(
+                "Enter the [blue]new wallet name[/blue] or [blue]SS58 address[/blue] of the new coldkey",
+            )
+
+        if is_valid_ss58_address(new_wallet_or_ss58):
+            new_wallet_coldkey_ss58 = new_wallet_or_ss58
+        else:
+            new_wallet_name = new_wallet_or_ss58
+            new_wallet = self.wallet_ask(
+                new_wallet_name,
+                wallet_path,
+                wallet_hotkey,
+                ask_for=[WO.NAME],
+                validate=WV.WALLET,
+            )
+            console.print(
+                f"\nNew wallet to swap the [blue]coldkey[/blue] to: \n"
+                f"[dark_sea_green3]{new_wallet}[/dark_sea_green3]\n"
+            )
+            new_wallet_coldkey_ss58 = new_wallet.coldkeypub.ss58_address
+
+        return self._run_command(
+            wallets.schedule_coldkey_swap(
+                wallet=wallet,
+                subtensor=self.initialize_chain(network),
+                new_coldkey_ss58=new_wallet_coldkey_ss58,
+                force_swap=force_swap,
+            )
+        )
 
     def stake_list(
         self,
@@ -2780,6 +3083,7 @@ class CLIManager:
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
         no_prompt: bool = Options.prompt,
+        json_output: bool = Options.json_output,
         # TODO add: all-wallets, reuse_last, html_output
     ):
         """
@@ -2801,7 +3105,7 @@ class CLIManager:
         4. Verbose output with full values:
         [green]$[/green] btcli stake list --wallet.name my_wallet --verbose
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
 
         wallet = None
         if coldkey_ss58:
@@ -2832,6 +3136,7 @@ class CLIManager:
                 live,
                 verbose,
                 no_prompt,
+                json_output,
             )
         )
 
@@ -2875,9 +3180,11 @@ class CLIManager:
         rate_tolerance: Optional[float] = Options.rate_tolerance,
         safe_staking: Optional[bool] = Options.safe_staking,
         allow_partial_stake: Optional[bool] = Options.allow_partial_stake,
+        era: int = Options.era,
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Stake TAO to one or more hotkeys on specific netuids with your coldkey.
@@ -2910,7 +3217,7 @@ class CLIManager:
         • [blue]--partial[/blue]: Complete partial stake if rates exceed tolerance
 
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         safe_staking = self.ask_safe_staking(safe_staking)
         if safe_staking:
             rate_tolerance = self.ask_rate_tolerance(rate_tolerance)
@@ -3068,6 +3375,8 @@ class CLIManager:
                 safe_staking,
                 rate_tolerance,
                 allow_partial_stake,
+                json_output,
+                era,
             )
         )
 
@@ -3119,6 +3428,7 @@ class CLIManager:
         rate_tolerance: Optional[float] = Options.rate_tolerance,
         safe_staking: Optional[bool] = Options.safe_staking,
         allow_partial_stake: Optional[bool] = Options.allow_partial_stake,
+        era: int = Options.era,
         prompt: bool = Options.prompt,
         interactive: bool = typer.Option(
             False,
@@ -3128,6 +3438,7 @@ class CLIManager:
         ),
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Unstake TAO from one or more hotkeys and transfer them back to the user's coldkey wallet.
@@ -3159,7 +3470,7 @@ class CLIManager:
         • [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)
+        self.verbosity_handler(quiet, verbose, json_output)
         if not unstake_all and not unstake_all_alpha:
             safe_staking = self.ask_safe_staking(safe_staking)
             if safe_staking:
@@ -3171,7 +3482,8 @@ class CLIManager:
             [hotkey_ss58_address, include_hotkeys, exclude_hotkeys, all_hotkeys]
         ):
             print_error(
-                "Interactive mode cannot be used with hotkey selection options like --include-hotkeys, --exclude-hotkeys, --all-hotkeys, or --hotkey."
+                "Interactive mode cannot be used with hotkey selection options like "
+                "--include-hotkeys, --exclude-hotkeys, --all-hotkeys, or --hotkey."
             )
             raise typer.Exit()
 
@@ -3308,6 +3620,8 @@ class CLIManager:
                     include_hotkeys=include_hotkeys,
                     exclude_hotkeys=exclude_hotkeys,
                     prompt=prompt,
+                    json_output=json_output,
+                    era=era,
                 )
             )
         elif (
@@ -3362,6 +3676,8 @@ class CLIManager:
                 safe_staking=safe_staking,
                 rate_tolerance=rate_tolerance,
                 allow_partial_stake=allow_partial_stake,
+                json_output=json_output,
+                era=era,
             )
         )
 
@@ -3389,9 +3705,11 @@ class CLIManager:
         stake_all: bool = typer.Option(
             False, "--stake-all", "--all", help="Stake all", prompt=False
         ),
+        era: int = Options.era,
         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.
@@ -3413,13 +3731,14 @@ class CLIManager:
 
         [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
@@ -3506,7 +3825,7 @@ class CLIManager:
                     "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,
@@ -3516,10 +3835,14 @@ class CLIManager:
                 destination_hotkey=destination_hotkey,
                 amount=amount,
                 stake_all=stake_all,
+                era=era,
                 interactive_selection=interactive_selection,
                 prompt=prompt,
             )
         )
+        if json_output:
+            json_console.print(json.dumps({"success": result}))
+        return result
 
     def stake_transfer(
         self,
@@ -3553,9 +3876,11 @@ class CLIManager:
         stake_all: bool = typer.Option(
             False, "--stake-all", "--all", help="Stake all", prompt=False
         ),
+        era: int = Options.era,
         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.
@@ -3589,10 +3914,10 @@ class CLIManager:
         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(
@@ -3664,7 +3989,7 @@ class CLIManager:
                     "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),
@@ -3673,11 +3998,15 @@ class CLIManager:
                 dest_netuid=dest_netuid,
                 dest_coldkey_ss58=dest_ss58,
                 amount=amount,
+                era=era,
                 interactive_selection=interactive_selection,
                 stake_all=stake_all,
                 prompt=prompt,
             )
         )
+        if json_output:
+            json_console.print(json.dumps({"success": result}))
+        return result
 
     def stake_swap(
         self,
@@ -3711,11 +4040,13 @@ class CLIManager:
             "--all",
             help="Swap all available stake",
         ),
+        era: int = Options.era,
         prompt: bool = Options.prompt,
         wait_for_inclusion: bool = Options.wait_for_inclusion,
         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.
@@ -3737,10 +4068,11 @@ class CLIManager:
         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]"
+            "[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,
@@ -3765,7 +4097,7 @@ class CLIManager:
             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),
@@ -3773,12 +4105,16 @@ class CLIManager:
                 destination_netuid=dest_netuid,
                 amount=amount,
                 swap_all=swap_all,
+                era=era,
                 interactive_selection=interactive_selection,
                 prompt=prompt,
                 wait_for_inclusion=wait_for_inclusion,
                 wait_for_finalization=wait_for_finalization,
             )
         )
+        if json_output:
+            json_console.print(json.dumps({"success": result}))
+        return result
 
     def stake_get_children(
         self,
@@ -3800,6 +4136,7 @@ class CLIManager:
         ),
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Get all the child hotkeys on a specified subnet.
@@ -3811,7 +4148,7 @@ class CLIManager:
         [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,
@@ -3832,11 +4169,14 @@ class CLIManager:
                 "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,
@@ -3861,6 +4201,7 @@ class CLIManager:
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
         prompt: bool = Options.prompt,
+        json_output: bool = Options.json_output,
     ):
         """
         Set child hotkeys on a specified subnet (or all). Overrides currently set children.
@@ -3873,7 +4214,7 @@ class CLIManager:
 
         [green]$[/green] btcli stake child set -c 5FCL3gmjtQV4xxxxuEPEFQVhyyyyqYgNwX7drFLw7MSdBnxP -c 5Hp5dxxxxtGg7pu8dN2btyyyyVA1vELmM9dy8KQv3LxV8PA7 --hotkey default --netuid 1 -p 0.3 -p 0.7
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         netuid = get_optional_netuid(netuid, all_netuids)
 
         children = list_prompt(
@@ -3885,7 +4226,8 @@ class CLIManager:
         proportions = list_prompt(
             proportions,
             float,
-            "Enter comma-separated proportions equal to the number of children (sum not exceeding a total of 1.0)",
+            "Enter comma-separated proportions equal to the number of children "
+            "(sum not exceeding a total of 1.0)",
         )
 
         if len(proportions) != len(children):
@@ -3913,6 +4255,7 @@ class CLIManager:
                 wait_for_finalization=wait_for_finalization,
                 wait_for_inclusion=wait_for_inclusion,
                 prompt=prompt,
+                json_output=json_output,
             )
         )
 
@@ -3939,6 +4282,7 @@ class CLIManager:
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
         prompt: bool = Options.prompt,
+        json_output: bool = Options.json_output,
     ):
         """
         Remove all children hotkeys on a specified subnet (or all).
@@ -3949,7 +4293,7 @@ class CLIManager:
 
         [green]$[/green] btcli stake child revoke --hotkey <parent_hotkey> --netuid 1
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -3974,6 +4318,7 @@ class CLIManager:
                 wait_for_inclusion,
                 wait_for_finalization,
                 prompt=prompt,
+                json_output=json_output,
             )
         )
 
@@ -4000,7 +4345,8 @@ class CLIManager:
             None,
             "--take",
             "-t",
-            help="Use to set the take value for your child hotkey. When not used, the command will fetch the current take value.",
+            help="Use to set the take value for your child hotkey. When not used, the command will fetch the current "
+            "take value.",
             prompt=False,
         ),
         wait_for_inclusion: bool = Options.wait_for_inclusion,
@@ -4008,6 +4354,7 @@ class CLIManager:
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Get and set your child hotkey take on a specified subnet.
@@ -4024,7 +4371,7 @@ class CLIManager:
 
             [green]$[/green] btcli stake child take --hotkey <child_hotkey> --take 0.12 --netuid 1
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -4041,7 +4388,7 @@ class CLIManager:
             netuid = IntPrompt.ask(
                 "Enter netuid (leave blank for all)", default=None, show_default=True
             )
-        return self._run_command(
+        results: list[tuple[Optional[int], bool]] = self._run_command(
             children_hotkeys.childkey_take(
                 wallet=wallet,
                 subtensor=self.initialize_chain(network),
@@ -4053,6 +4400,12 @@ class CLIManager:
                 prompt=prompt,
             )
         )
+        if json_output:
+            output = {}
+            for netuid_, success in results:
+                output[netuid_] = success
+            json_console.print(json.dumps(output))
+        return results
 
     def sudo_set(
         self,
@@ -4069,6 +4422,7 @@ class CLIManager:
         ),
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Used to set hyperparameters for a specific subnet.
@@ -4079,7 +4433,7 @@ class CLIManager:
 
         [green]$[/green] btcli sudo set --netuid 1 --param tempo --value 400
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
 
         if not param_name or not param_value:
             hyperparams = self._run_command(
@@ -4124,15 +4478,19 @@ class CLIManager:
         wallet = self.wallet_ask(
             wallet_name, wallet_path, wallet_hotkey, ask_for=[WO.NAME, WO.PATH]
         )
-        return self._run_command(
+        result = self._run_command(
             sudo.sudo_set_hyperparameter(
                 wallet,
                 self.initialize_chain(network),
                 netuid,
                 param_name,
                 param_value,
+                json_output,
             )
         )
+        if json_output:
+            json_console.print(json.dumps({"success": result}))
+        return result
 
     def sudo_get(
         self,
@@ -4140,6 +4498,7 @@ class CLIManager:
         netuid: int = Options.netuid,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Shows a list of the hyperparameters for the specified subnet.
@@ -4148,9 +4507,11 @@ class CLIManager:
 
         [green]$[/green] btcli sudo get --netuid 1
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         return self._run_command(
-            sudo.get_hyperparameters(self.initialize_chain(network), netuid)
+            sudo.get_hyperparameters(
+                self.initialize_chain(network), netuid, json_output
+            )
         )
 
     def sudo_senate(
@@ -4158,6 +4519,7 @@ class CLIManager:
         network: Optional[list[str]] = Options.network,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Shows the Senate members of the Bittensor's governance protocol.
@@ -4167,14 +4529,17 @@ class CLIManager:
         EXAMPLE
         [green]$[/green] btcli sudo senate
         """
-        self.verbosity_handler(quiet, verbose)
-        return self._run_command(sudo.get_senate(self.initialize_chain(network)))
+        self.verbosity_handler(quiet, verbose, json_output)
+        return self._run_command(
+            sudo.get_senate(self.initialize_chain(network), json_output)
+        )
 
     def sudo_proposals(
         self,
         network: Optional[list[str]] = Options.network,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         View active proposals for the senate in the Bittensor's governance protocol.
@@ -4184,9 +4549,9 @@ class CLIManager:
         EXAMPLE
         [green]$[/green] btcli sudo proposals
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         return self._run_command(
-            sudo.proposals(self.initialize_chain(network), verbose)
+            sudo.proposals(self.initialize_chain(network), verbose, json_output)
         )
 
     def sudo_senate_vote(
@@ -4223,6 +4588,7 @@ class CLIManager:
         EXAMPLE
         [green]$[/green] btcli sudo senate_vote --proposal <proposal_hash>
         """
+        # TODO discuss whether this should receive json_output. I don't think it should.
         self.verbosity_handler(quiet, verbose)
         wallet = self.wallet_ask(
             wallet_name,
@@ -4246,6 +4612,7 @@ class CLIManager:
         take: float = typer.Option(None, help="The new take value."),
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Allows users to change their delegate take percentage.
@@ -4258,7 +4625,7 @@ class CLIManager:
         """
         max_value = 0.18
         min_value = 0.00
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
 
         wallet = self.wallet_ask(
             wallet_name,
@@ -4283,9 +4650,12 @@ class CLIManager:
             )
             raise typer.Exit()
 
-        return self._run_command(
+        result = self._run_command(
             sudo.set_take(wallet, self.initialize_chain(network), take)
         )
+        if json_output:
+            json_console.print(json.dumps({"success": result}))
+        return result
 
     def sudo_get_take(
         self,
@@ -4295,6 +4665,7 @@ class CLIManager:
         wallet_hotkey: Optional[str] = Options.wallet_hotkey,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Allows users to check their delegate take percentage.
@@ -4304,7 +4675,7 @@ class CLIManager:
         EXAMPLE
         [green]$[/green] btcli sudo get-take --wallet-name my_wallet --wallet-hotkey my_hotkey
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
 
         wallet = self.wallet_ask(
             wallet_name,
@@ -4313,10 +4684,15 @@ class CLIManager:
             ask_for=[WO.NAME, WO.PATH, WO.HOTKEY],
             validate=WV.WALLET_AND_HOTKEY,
         )
-
-        self._run_command(
-            sudo.display_current_take(self.initialize_chain(network), wallet)
-        )
+        if json_output:
+            result = self._run_command(
+                sudo.get_current_take(self.initialize_chain(network), wallet)
+            )
+            json_console.print(json.dumps({"current_take": result}))
+        else:
+            self._run_command(
+                sudo.display_current_take(self.initialize_chain(network), wallet)
+            )
 
     def subnets_list(
         self,
@@ -4324,6 +4700,7 @@ class CLIManager:
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
         live_mode: bool = Options.live,
+        json_output: bool = Options.json_output,
     ):
         """
          List all subnets and their detailed information.
@@ -4351,7 +4728,10 @@ class CLIManager:
 
          [green]$[/green] btcli subnets list
         """
-        self.verbosity_handler(quiet, verbose)
+        if json_output and live_mode:
+            print_error("Cannot use `--json-output` and `--live` at the same time.")
+            return
+        self.verbosity_handler(quiet, verbose, json_output)
         subtensor = self.initialize_chain(network)
         return self._run_command(
             subnets.subnets_list(
@@ -4361,6 +4741,7 @@ class CLIManager:
                 not self.config.get("use_cache", True),
                 verbose,
                 live_mode,
+                json_output,
             )
         )
 
@@ -4393,6 +4774,9 @@ class CLIManager:
             help="Show the price in log scale.",
         ),
         html_output: bool = Options.html_output,
+        quiet: bool = Options.quiet,
+        verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Shows the historical price of a subnet for the past 24 hours.
@@ -4410,6 +4794,10 @@ class CLIManager:
         [green]$[/green] btcli subnets price --all --html
         [green]$[/green] btcli subnets price --netuids 1,2,3,4 --html
         """
+        if json_output and html_output:
+            print_error("Cannot specify both `--json-output` and `--html`")
+            return
+        self.verbosity_handler(quiet=quiet, verbose=verbose, json_output=json_output)
         if netuids:
             netuids = parse_to_list(
                 netuids,
@@ -4418,15 +4806,15 @@ class CLIManager:
             )
         if all_netuids and netuids:
             print_error("Cannot specify both --netuid and --all-netuids")
-            raise typer.Exit()
+            return
 
         if not netuids and not all_netuids:
             netuids = Prompt.ask(
-                "Enter the [blue]netuid(s)[/blue] to view the price of in comma-separated format [dim](or Press Enter to view all subnets)[/dim]",
+                "Enter the [blue]netuid(s)[/blue] to view the price of in comma-separated format [dim]"
+                "(or Press Enter to view all subnets)[/dim]",
             )
             if not netuids:
                 all_netuids = True
-                html_output = True
             else:
                 netuids = parse_to_list(
                     netuids,
@@ -4434,7 +4822,7 @@ class CLIManager:
                     "Netuids must be a comma-separated list of ints, e.g., `--netuids 1,2,3,4`.",
                 )
 
-        if all_netuids:
+        if all_netuids and not json_output:
             html_output = True
 
         if html_output and is_linux():
@@ -4448,6 +4836,7 @@ class CLIManager:
                 interval_hours,
                 html_output,
                 log_scale,
+                json_output,
             )
         )
 
@@ -4463,6 +4852,7 @@ class CLIManager:
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
         prompt: bool = Options.prompt,
+        json_output: bool = Options.json_output,
     ):
         """
         Displays detailed information about a subnet including participants and their state.
@@ -4471,7 +4861,7 @@ class CLIManager:
 
         [green]$[/green] btcli subnets list
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         subtensor = self.initialize_chain(network)
         return self._run_command(
             subnets.show(
@@ -4482,6 +4872,7 @@ class CLIManager:
                 delegate_selection=False,
                 verbose=verbose,
                 prompt=prompt,
+                json_output=json_output,
             )
         )
 
@@ -4490,6 +4881,7 @@ class CLIManager:
         network: Optional[list[str]] = Options.network,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Shows the required amount of TAO to be recycled for creating a new subnet, i.e., cost of registering a new subnet.
@@ -4500,8 +4892,10 @@ class CLIManager:
 
         [green]$[/green] btcli subnets burn_cost
         """
-        self.verbosity_handler(quiet, verbose)
-        return self._run_command(subnets.burn_cost(self.initialize_chain(network)))
+        self.verbosity_handler(quiet, verbose, json_output)
+        return self._run_command(
+            subnets.burn_cost(self.initialize_chain(network), json_output)
+        )
 
     def subnets_create(
         self,
@@ -4510,7 +4904,7 @@ class CLIManager:
         wallet_hotkey: str = Options.wallet_hotkey,
         network: Optional[list[str]] = Options.network,
         subnet_name: Optional[str] = typer.Option(
-            None, "--subnet-name", "--name", help="Name of the subnet"
+            None, "--subnet-name", help="Name of the subnet"
         ),
         github_repo: Optional[str] = typer.Option(
             None, "--github-repo", "--repo", help="GitHub repository URL"
@@ -4534,6 +4928,7 @@ class CLIManager:
         additional_info: Optional[str] = typer.Option(
             None, "--additional-info", help="Additional information"
         ),
+        json_output: bool = Options.json_output,
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
@@ -4552,7 +4947,7 @@ class CLIManager:
         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)
+        self.verbosity_handler(quiet, verbose, json_output)
         wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -4574,34 +4969,19 @@ class CLIManager:
             description=description,
             additional=additional_info,
         )
-        success = self._run_command(
-            subnets.create(wallet, self.initialize_chain(network), identity, prompt),
-            exit_early=False,
+        self._run_command(
+            subnets.create(
+                wallet, self.initialize_chain(network), identity, json_output, prompt
+            )
         )
 
-        if success and prompt:
-            set_id = Confirm.ask(
-                "[dark_sea_green3]Do you want to set/update your identity?",
-                default=False,
-                show_default=True,
-            )
-            if set_id:
-                self.wallet_set_id(
-                    wallet_name=wallet.name,
-                    wallet_hotkey=wallet.hotkey,
-                    wallet_path=wallet.path,
-                    network=network,
-                    prompt=prompt,
-                    quiet=quiet,
-                    verbose=verbose,
-                )
-
     def subnets_get_identity(
         self,
         network: Optional[list[str]] = Options.network,
         netuid: int = Options.netuid,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
+        json_output: bool = Options.json_output,
     ):
         """
         Get the identity information for a subnet.
@@ -4610,11 +4990,10 @@ class CLIManager:
 
         [green]$[/green] btcli subnets get-identity --netuid 1
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         return self._run_command(
             subnets.get_identity(
-                self.initialize_chain(network),
-                netuid,
+                self.initialize_chain(network), netuid, json_output=json_output
             )
         )
 
@@ -4650,6 +5029,7 @@ class CLIManager:
         additional_info: Optional[str] = typer.Option(
             None, "--additional-info", help="Additional information"
         ),
+        json_output: bool = Options.json_output,
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
@@ -4667,7 +5047,7 @@ class CLIManager:
         2. Set subnet identity with specific values:
         [green]$[/green] btcli subnets set-identity --netuid 1 --subnet-name MySubnet --github-repo https://github.com/myorg/mysubnet --subnet-contact team@mysubnet.net
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -4685,7 +5065,9 @@ class CLIManager:
             exit_early=False,
         )
         if current_identity is None:
-            raise typer.Exit()
+            if json_output:
+                json_console.print('{"success": false}')
+            return
 
         identity = prompt_for_subnet_identity(
             current_identity=current_identity,
@@ -4698,15 +5080,13 @@ class CLIManager:
             additional=additional_info,
         )
 
-        return self._run_command(
+        success = self._run_command(
             subnets.set_identity(
-                wallet,
-                self.initialize_chain(network),
-                netuid,
-                identity,
-                prompt,
+                wallet, self.initialize_chain(network), netuid, identity, prompt
             )
         )
+        if json_output:
+            json_console.print(json.dumps({"success": success}))
 
     def subnets_pow_register(
         self,
@@ -4804,6 +5184,14 @@ class CLIManager:
         wallet_hotkey: str = Options.wallet_hotkey,
         network: Optional[list[str]] = Options.network,
         netuid: int = Options.netuid,
+        era: Optional[
+            int
+        ] = typer.Option(  # Should not be Options.era bc this needs to be an Optional[int]
+            None,
+            help="Length (in blocks) for which the transaction should be valid. Note that it is possible that if you "
+            "use an era for this transaction that you may pay a different fee to register than the one stated.",
+        ),
+        json_output: bool = Options.json_output,
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
@@ -4819,7 +5207,7 @@ class CLIManager:
 
         [green]$[/green] btcli subnets register --netuid 1
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         wallet = self.wallet_ask(
             wallet_name,
             wallet_path,
@@ -4832,6 +5220,8 @@ class CLIManager:
                 wallet,
                 self.initialize_chain(network),
                 netuid,
+                era,
+                json_output,
                 prompt,
             )
         )
@@ -4957,6 +5347,7 @@ class CLIManager:
             "-s",
             help="Corresponding salt for the hash function, e.g. -s 163,241,217 ...",
         ),
+        json_output: bool = Options.json_output,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
         prompt: bool = Options.prompt,
@@ -4970,7 +5361,7 @@ class CLIManager:
 
         [green]$[/green] btcli wt reveal --netuid 1 --uids 1,2,3,4 --weights 0.1,0.2,0.3,0.4 --salt 163,241,217,11,161,142,147,189
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
         uids = list_prompt(uids, int, "UIDs of interest for the specified netuid")
         weights = list_prompt(
             weights, float, "Corresponding weights for the specified UIDs"
@@ -5003,7 +5394,7 @@ class CLIManager:
             err_console.print(
                 "The number of UIDs you specify must match up with the specified number of weights"
             )
-            raise typer.Exit()
+            return
 
         if salt:
             salt = parse_to_list(
@@ -5032,6 +5423,7 @@ class CLIManager:
                 salt,
                 __version_as_int__,
                 prompt=prompt,
+                json_output=json_output,
             )
         )
 
@@ -5055,6 +5447,7 @@ class CLIManager:
             "-s",
             help="Corresponding salt for the hash function, e.g. -s 163 -s 241 -s 217 ...",
         ),
+        json_output: bool = Options.json_output,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
         prompt: bool = Options.prompt,
@@ -5072,7 +5465,7 @@ class CLIManager:
         [italic]Note[/italic]: This command is used to commit weights for a specific subnet and requires the user to have the necessary
         permissions.
         """
-        self.verbosity_handler(quiet, verbose)
+        self.verbosity_handler(quiet, verbose, json_output)
 
         if uids:
             uids = parse_to_list(
@@ -5101,7 +5494,7 @@ class CLIManager:
             err_console.print(
                 "The number of UIDs you specify must match up with the specified number of weights"
             )
-            raise typer.Exit()
+            return
 
         if salt:
             salt = parse_to_list(
@@ -5128,6 +5521,7 @@ class CLIManager:
                 weights,
                 salt,
                 __version_as_int__,
+                json_output=json_output,
                 prompt=prompt,
             )
         )