Merge branch 'staging' into fix/thewhaleking/btcli-swap-status

Author: thewhaleking

CHANGELOG.md

@@ -1,6 +1,33 @@
 # Changelog
 
+## 9.7.0/2025-06-16
+
+## What's Changed
+* Add `SKIP_PULL` variable for conftest.py by @basfroman in https://github.com/opentensor/btcli/pull/502
+* Feat: Adds netuid support in swap_hotkeys by @ibraheem-abe in https://github.com/opentensor/btcli/pull/505
+
+**Full Changelog**: https://github.com/opentensor/btcli/compare/v9.6.0...v9.7.0
+
+## 9.6.0/2025-06-12
+
+## What's Changed
+* Allows for staking to multiple netuids in one btcli command by @thewhaleking in https://github.com/opentensor/btcli/pull/481
+* improve stake add json output by @thewhaleking in https://github.com/opentensor/btcli/pull/482
+* Apply bittensor error formatting to btcli by @thewhaleking in https://github.com/opentensor/btcli/pull/483
+* Add Yuma3 Enabled for Sudo Set/Get by @thewhaleking in https://github.com/opentensor/btcli/pull/487
+* Adds `alpha_sigmoid_steepness` call for hyperparams set/get by @thewhaleking in https://github.com/opentensor/btcli/pull/488
+* unstaking test fix by @thewhaleking in https://github.com/opentensor/btcli/pull/489
+* Merge issue: 488 by @thewhaleking in https://github.com/opentensor/btcli/pull/490
+* subnets check-start formatting blocks by @thewhaleking in https://github.com/opentensor/btcli/pull/491
+* Str vs Tuple by @thewhaleking in https://github.com/opentensor/btcli/pull/492
+* Add Homebrew Install to README by @thewhaleking in https://github.com/opentensor/btcli/pull/493
+* Update staking test for new subtensor by @thewhaleking in https://github.com/opentensor/btcli/pull/494
+
+
+**Full Changelog**: https://github.com/opentensor/btcli/compare/v9.5.1...v9.6.0
+
 ## 9.5.1 /2025-06-02
+
 ## What's Changed
 * Declare templates in MANIFEST and include package data by @thewhaleking in https://github.com/opentensor/btcli/pull/477
 

README.md

@@ -38,10 +38,10 @@ Installation steps are described below. For a full documentation on how to use `
 
 ## Install on macOS and Linux
 
-You can install `btcli` on your local machine directly from source, or from PyPI. **Make sure you verify your installation after you install**:
+You can install `btcli` on your local machine directly from source, PyPI, or Homebrew. **Make sure you verify your installation after you install**:
 
 
-### Install from PyPI
+### Install from [PyPI](https://pypi.org/project/bittensor/)
 
 Run 
 ```
@@ -53,6 +53,12 @@ Alternatively, if you prefer to use [uv](https://pypi.org/project/uv/):
 uv pip install bittensor-cli
 ```
 
+### Install from [Homebrew](https://formulae.brew.sh/formula/btcli#default)
+
+```shell
+brew install btcli
+```
+
 ### Install from source
 
 1. Create and activate a virtual environment.

bittensor_cli/cli.py

@@ -11,7 +11,7 @@
 import traceback
 import warnings
 from pathlib import Path
-from typing import Coroutine, Optional, Union
+from typing import Coroutine, Optional
 from dataclasses import fields
 
 import rich
@@ -929,11 +929,13 @@ def __init__(self):
         )(self.view_dashboard)
 
         # Sub command aliases
-        # Weights
+        # Wallet
         self.wallet_app.command(
             "swap_hotkey",
             hidden=True,
         )(self.wallet_swap_hotkey)
+        self.wallet_app.command("swap_coldkey", hidden=True)(self.wallet_swap_coldkey)
+        self.wallet_app.command("swap_check", hidden=True)(self.wallet_check_ck_swap)
         self.wallet_app.command(
             "regen_coldkey",
             hidden=True,
@@ -962,10 +964,14 @@ def __init__(self):
             "get_identity",
             hidden=True,
         )(self.wallet_get_id)
+        self.wallet_app.command("associate_hotkey")(self.wallet_associate_hotkey)
 
         # Subnets
         self.subnets_app.command("burn_cost", hidden=True)(self.subnets_burn_cost)
         self.subnets_app.command("pow_register", hidden=True)(self.subnets_pow_register)
+        self.subnets_app.command("set_identity", hidden=True)(self.subnets_set_identity)
+        self.subnets_app.command("get_identity", hidden=True)(self.subnets_get_identity)
+        self.subnets_app.command("check_start", hidden=True)(self.subnets_check_start)
 
         # Sudo
         self.sudo_app.command("senate_vote", hidden=True)(self.sudo_senate_vote)
@@ -1897,6 +1903,8 @@ def wallet_swap_hotkey(
         wallet_name: Optional[str] = Options.wallet_name,
         wallet_path: Optional[str] = Options.wallet_path,
         wallet_hotkey: Optional[str] = Options.wallet_hotkey,
+        netuid: Optional[int] = Options.netuid_not_req,
+        all_netuids: bool = Options.all_netuids,
         network: Optional[list[str]] = Options.network,
         destination_hotkey_name: Optional[str] = typer.Argument(
             None, help="Destination hotkey name."
@@ -1917,12 +1925,14 @@ def wallet_swap_hotkey(
 
         - Make sure that your original key pair (coldkeyA, hotkeyA) is already registered.
         - Make sure that you use a newly created hotkeyB in this command. A hotkeyB that is already registered cannot be used in this command.
+        - You can specify the netuid for which you want to swap the hotkey for. If it is not defined, the swap will be initiated for all subnets.
         - Finally, note that this command requires a fee of 1 TAO for recycling and this fee is taken from your wallet (coldkeyA).
 
         EXAMPLE
 
-        [green]$[/green] btcli wallet swap_hotkey destination_hotkey_name --wallet-name your_wallet_name --wallet-hotkey original_hotkey
+        [green]$[/green] btcli wallet swap_hotkey destination_hotkey_name --wallet-name your_wallet_name --wallet-hotkey original_hotkey --netuid 1
         """
+        netuid = get_optional_netuid(netuid, all_netuids)
         self.verbosity_handler(quiet, verbose, json_output)
         original_wallet = self.wallet_ask(
             wallet_name,
@@ -1946,7 +1956,7 @@ def wallet_swap_hotkey(
         self.initialize_chain(network)
         return self._run_command(
             wallets.swap_hotkey(
-                original_wallet, new_wallet, self.subtensor, prompt, json_output
+                original_wallet, new_wallet, self.subtensor, netuid, prompt, json_output
             )
         )
 
@@ -5021,6 +5031,7 @@ def subnets_create(
         description: Optional[str] = typer.Option(
             None, "--description", help="Description"
         ),
+        logo_url: Optional[str] = typer.Option(None, "--logo-url", help="Logo URL"),
         additional_info: Optional[str] = typer.Option(
             None, "--additional-info", help="Additional information"
         ),
@@ -5063,6 +5074,7 @@ def subnets_create(
             subnet_url=subnet_url,
             discord=discord,
             description=description,
+            logo_url=logo_url,
             additional=additional_info,
         )
         self._run_command(
@@ -5084,7 +5096,7 @@ def subnets_check_start(
         This command verifies if a subnet's emission schedule can be started based on the subnet's registration block.
 
         Example:
-        [green]$[/green] btcli subnets check_start --netuid 1
+        [green]$[/green] btcli subnets check-start --netuid 1
         """
         self.verbosity_handler(quiet, verbose)
         return self._run_command(
@@ -5186,6 +5198,7 @@ def subnets_set_identity(
         description: Optional[str] = typer.Option(
             None, "--description", help="Description"
         ),
+        logo_url: Optional[str] = typer.Option(None, "--logo-url", help="Logo URL"),
         additional_info: Optional[str] = typer.Option(
             None, "--additional-info", help="Additional information"
         ),
@@ -5237,6 +5250,7 @@ def subnets_set_identity(
             subnet_url=subnet_url,
             discord=discord,
             description=description,
+            logo_url=logo_url,
             additional=additional_info,
         )
 

bittensor_cli/src/__init__.py

@@ -658,6 +658,8 @@ class WalletValidationTypes(Enum):
         "sudo_set_network_pow_registration_allowed",
         False,
     ),
+    "yuma3_enabled": ("sudo_set_yuma3_enabled", False),
+    "alpha_sigmoid_steepness": ("sudo_set_alpha_sigmoid_steepness", True),
 }
 
 # Help Panels for cli help

bittensor_cli/src/bittensor/chain_data.py

@@ -177,6 +177,8 @@ class SubnetHyperparameters(InfoBase):
     alpha_high: int
     alpha_low: int
     liquid_alpha_enabled: bool
+    yuma3_enabled: bool
+    alpha_sigmoid_steepness: int
 
     @classmethod
     def _fix_decoded(
@@ -210,6 +212,8 @@ def _fix_decoded(
             alpha_high=decoded.get("alpha_high"),
             alpha_low=decoded.get("alpha_low"),
             liquid_alpha_enabled=decoded.get("liquid_alpha_enabled"),
+            yuma3_enabled=decoded.get("yuma3_enabled"),
+            alpha_sigmoid_steepness=decoded.get("alpha_sigmoid_steepness"),
         )
 
 
@@ -626,6 +630,7 @@ class SubnetIdentity(InfoBase):
     subnet_url: str
     discord: str
     description: str
+    logo_url: str
     additional: str
 
     @classmethod
@@ -637,6 +642,7 @@ def _fix_decoded(cls, decoded: dict) -> "SubnetIdentity":
             subnet_url=bytes(decoded["subnet_url"]).decode(),
             discord=bytes(decoded["discord"]).decode(),
             description=bytes(decoded["description"]).decode(),
+            logo_url=bytes(decoded["logo_url"]).decode(),
             additional=bytes(decoded["additional"]).decode(),
         )
 

bittensor_cli/src/bittensor/extrinsics/registration.py

@@ -1611,7 +1611,8 @@ def _update_curr_block(
     """
     Update the current block data with the provided block information and difficulty.
 
-    This function updates the current block and its difficulty in a thread-safe manner. It sets the current block
+    This function updates the current block
+    and its difficulty in a thread-safe manner. It sets the current block
     number, hashes the block with the hotkey, updates the current block bytes, and packs the difficulty.
 
     :param curr_diff: Shared array to store the current difficulty.
@@ -1745,6 +1746,7 @@ async def swap_hotkey_extrinsic(
     subtensor: "SubtensorInterface",
     wallet: Wallet,
     new_wallet: Wallet,
+    netuid: Optional[int] = None,
     prompt: bool = False,
 ) -> bool:
     """
@@ -1756,43 +1758,81 @@ async def swap_hotkey_extrinsic(
     netuids_registered = await subtensor.get_netuids_for_hotkey(
         wallet.hotkey.ss58_address, block_hash=block_hash
     )
-    if not len(netuids_registered) > 0:
+    netuids_registered_new_hotkey = await subtensor.get_netuids_for_hotkey(
+        new_wallet.hotkey.ss58_address, block_hash=block_hash
+    )
+
+    if netuid is not None and netuid not in netuids_registered:
+        err_console.print(
+            f":cross_mark: [red]Failed[/red]: Original hotkey {wallet.hotkey.ss58_address} is not registered on subnet {netuid}"
+        )
+        return False
+
+    elif not len(netuids_registered) > 0:
         err_console.print(
-            f"Destination hotkey [dark_orange]{new_wallet.hotkey.ss58_address}[/dark_orange] is not registered. "
+            f"Original hotkey [dark_orange]{wallet.hotkey.ss58_address}[/dark_orange] is not registered on any subnet. "
             f"Please register and try again"
         )
         return False
 
+    if netuid is not None:
+        if netuid in netuids_registered_new_hotkey:
+            err_console.print(
+                f":cross_mark: [red]Failed[/red]: New hotkey {new_wallet.hotkey.ss58_address} "
+                f"is already registered on subnet {netuid}"
+            )
+            return False
+    else:
+        if len(netuids_registered_new_hotkey) > 0:
+            err_console.print(
+                f":cross_mark: [red]Failed[/red]: New hotkey {new_wallet.hotkey.ss58_address} "
+                f"is already registered on subnet(s) {netuids_registered_new_hotkey}"
+            )
+            return False
+
     if not unlock_key(wallet).success:
         return False
 
     if prompt:
         # Prompt user for confirmation.
-        if not Confirm.ask(
-            f"Do you want to swap [dark_orange]{wallet.name}[/dark_orange] hotkey \n\t"
-            f"[dark_orange]{wallet.hotkey.ss58_address}[/dark_orange] with hotkey \n\t"
-            f"[dark_orange]{new_wallet.hotkey.ss58_address}[/dark_orange]\n"
-            "This operation will cost [bold cyan]1 TAO t (recycled)[/bold cyan]"
-        ):
+        if netuid is not None:
+            confirm_message = (
+                f"Do you want to swap [dark_orange]{wallet.name}[/dark_orange] hotkey \n\t"
+                f"[dark_orange]{wallet.hotkey.ss58_address} ({wallet.hotkey_str})[/dark_orange] with hotkey \n\t"
+                f"[dark_orange]{new_wallet.hotkey.ss58_address} ({new_wallet.hotkey_str})[/dark_orange] on subnet {netuid}\n"
+                "This operation will cost [bold cyan]1 TAO (recycled)[/bold cyan]"
+            )
+        else:
+            confirm_message = (
+                f"Do you want to swap [dark_orange]{wallet.name}[/dark_orange] hotkey \n\t"
+                f"[dark_orange]{wallet.hotkey.ss58_address} ({wallet.hotkey_str})[/dark_orange] with hotkey \n\t"
+                f"[dark_orange]{new_wallet.hotkey.ss58_address} ({new_wallet.hotkey_str})[/dark_orange] on all subnets\n"
+                "This operation will cost [bold cyan]1 TAO (recycled)[/bold cyan]"
+            )
+
+        if not Confirm.ask(confirm_message):
             return False
     print_verbose(
-        f"Swapping {wallet.name}'s hotkey ({wallet.hotkey.ss58_address}) with "
-        f"{new_wallet.name}s hotkey ({new_wallet.hotkey.ss58_address})"
+        f"Swapping {wallet.name}'s hotkey ({wallet.hotkey.ss58_address} - {wallet.hotkey_str}) with "
+        f"{new_wallet.name}'s hotkey ({new_wallet.hotkey.ss58_address} - {new_wallet.hotkey_str})"
     )
     with console.status(":satellite: Swapping hotkeys...", spinner="aesthetic"):
+        call_params = {
+            "hotkey": wallet.hotkey.ss58_address,
+            "new_hotkey": new_wallet.hotkey.ss58_address,
+            "netuid": netuid,
+        }
+
         call = await subtensor.substrate.compose_call(
             call_module="SubtensorModule",
             call_function="swap_hotkey",
-            call_params={
-                "hotkey": wallet.hotkey.ss58_address,
-                "new_hotkey": new_wallet.hotkey.ss58_address,
-            },
+            call_params=call_params,
         )
         success, err_msg = await subtensor.sign_and_send_extrinsic(call, wallet)
 
         if success:
             console.print(
-                f"Hotkey {wallet.hotkey} swapped for new hotkey: {new_wallet.hotkey}"
+                f"Hotkey {wallet.hotkey.ss58_address} ({wallet.hotkey_str}) swapped for new hotkey: {new_wallet.hotkey.ss58_address} ({new_wallet.hotkey_str})"
             )
             return True
         else:

bittensor_cli/src/bittensor/subtensor_interface.py

@@ -1128,14 +1128,22 @@ async def get_subnet_hyperparameters(
         Understanding the hyperparameters is crucial for comprehending how subnets are configured and
         managed, and how they interact with the network's consensus and incentive mechanisms.
         """
-        result = await self.query_runtime_api(
-            runtime_api="SubnetInfoRuntimeApi",
-            method="get_subnet_hyperparams",
-            params=[netuid],
-            block_hash=block_hash,
+        main_result, yuma3_result, sigmoid_steepness = await asyncio.gather(
+            self.query_runtime_api(
+                runtime_api="SubnetInfoRuntimeApi",
+                method="get_subnet_hyperparams",
+                params=[netuid],
+                block_hash=block_hash,
+            ),
+            self.query("SubtensorModule", "Yuma3On", [netuid]),
+            self.query("SubtensorModule", "AlphaSigmoidSteepness", [netuid]),
         )
-
-        if not result:
+        result = {
+            **main_result,
+            **{"yuma3_enabled": yuma3_result},
+            **{"alpha_sigmoid_steepness": sigmoid_steepness},
+        }
+        if not main_result:
             return []
 
         return SubnetHyperparameters.from_any(result)