bittensor-cli 9.0.1__py3-none-any.whl → 9.0.3__py3-none-any.whl

bittensor_cli/__init__.py

@@ -16,8 +16,7 @@
 # DEALINGS IN THE SOFTWARE.
 
 from .cli import CLIManager
+from .version import __version__, __version_as_int__
 
 
-__version__ = "9.0.1"
-
-__all__ = ["CLIManager", "__version__"]
+__all__ = ["CLIManager"]

bittensor_cli/cli.py

@@ -26,7 +26,9 @@ from bittensor_cli.src import (
     WalletValidationTypes as WV,
     Constants,
     COLOR_PALETTE,
+    HYPERPARAMS,
 )
+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
@@ -72,21 +74,6 @@ except ImportError:
         pass
 
 
-__version__ = "9.0.1"
-
-
-_core_version = re.match(r"^\d+\.\d+\.\d+", __version__).group(0)
-_version_split = _core_version.split(".")
-__version_info__ = tuple(int(part) for part in _version_split)
-_version_int_base = 1000
-assert max(__version_info__) < _version_int_base
-
-__version_as_int__: int = sum(
-    e * (_version_int_base**i) for i, e in enumerate(reversed(__version_info__))
-)
-assert __version_as_int__ < 2**31  # fits in int32
-__new_signature_version__ = 360
-
 _epilog = "Made with [bold red]:heart:[/bold red] by The Openτensor Foundaτion"
 
 np.set_printoptions(precision=8, suppress=True, floatmode="fixed")
@@ -124,7 +111,7 @@ class Options:
     )
     mnemonic = typer.Option(
         None,
-        help="Mnemonic used to regenerate your key. For example: horse cart dog ...",
+        help='Mnemonic used to regenerate your key. For example: "horse cart dog ..."',
     )
     seed = typer.Option(
         None, help="Seed hex string used to regenerate your key. For example: 0x1234..."
@@ -492,7 +479,7 @@ def version_callback(value: bool):
                 f"{repo.active_branch.name}/"
                 f"{repo.commit()}"
             )
-        except (NameError, GitError):
+        except (TypeError, GitError):
             version = f"BTCLI version: {__version__}"
         typer.echo(version)
         raise typer.Exit()
@@ -2130,6 +2117,7 @@ class CLIManager:
         # Example usage:
 
         [green]$[/green] btcli wallet regen_hotkey --seed 0x1234...
+        [green]$[/green] btcli wallet regen-hotkey --mnemonic "word1 word2 ... word12"
 
         [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.
@@ -3221,11 +3209,23 @@ class CLIManager:
                 else:
                     print_error("Invalid hotkey ss58 address.")
                     raise typer.Exit()
-            else:
-                hotkey_or_ss58 = Prompt.ask(
-                    "Enter the [blue]hotkey[/blue] name or [blue]ss58 address[/blue] to unstake all from",
-                    default=self.config.get("wallet_hotkey") or defaults.wallet.hotkey,
+            elif all_hotkeys:
+                wallet = self.wallet_ask(
+                    wallet_name,
+                    wallet_path,
+                    wallet_hotkey,
+                    ask_for=[WO.NAME, WO.PATH],
                 )
+            else:
+                if not hotkey_ss58_address and not wallet_hotkey:
+                    hotkey_or_ss58 = Prompt.ask(
+                        "Enter the [blue]hotkey[/blue] name or [blue]ss58 address[/blue] to unstake all from [dim](or enter 'all' to unstake from all hotkeys)[/dim]",
+                        default=self.config.get("wallet_hotkey")
+                        or defaults.wallet.hotkey,
+                    )
+                else:
+                    hotkey_or_ss58 = hotkey_ss58_address or wallet_hotkey
+
                 if is_valid_ss58_address(hotkey_or_ss58):
                     hotkey_ss58_address = hotkey_or_ss58
                     wallet = self.wallet_ask(
@@ -3234,6 +3234,14 @@ class CLIManager:
                         wallet_hotkey,
                         ask_for=[WO.NAME, WO.PATH],
                     )
+                elif hotkey_or_ss58 == "all":
+                    all_hotkeys = True
+                    wallet = self.wallet_ask(
+                        wallet_name,
+                        wallet_path,
+                        wallet_hotkey,
+                        ask_for=[WO.NAME, WO.PATH],
+                    )
                 else:
                     wallet_hotkey = hotkey_or_ss58
                     wallet = self.wallet_ask(
@@ -3249,6 +3257,9 @@ class CLIManager:
                     subtensor=self.initialize_chain(network),
                     hotkey_ss58_address=hotkey_ss58_address,
                     unstake_all_alpha=unstake_all_alpha,
+                    all_hotkeys=all_hotkeys,
+                    include_hotkeys=include_hotkeys,
+                    exclude_hotkeys=exclude_hotkeys,
                     prompt=prompt,
                 )
             )
@@ -3310,9 +3321,9 @@ class CLIManager:
     def stake_move(
         self,
         network: Optional[list[str]] = Options.network,
-        wallet_name=Options.wallet_name,
-        wallet_path=Options.wallet_path,
-        wallet_hotkey=Options.wallet_hotkey,
+        wallet_name: Optional[str] = Options.wallet_name,
+        wallet_path: Optional[str] = Options.wallet_path,
+        wallet_hotkey: Optional[str] = Options.wallet_hotkey,
         origin_netuid: Optional[int] = typer.Option(
             None, "--origin-netuid", help="Origin netuid"
         ),
@@ -3522,14 +3533,45 @@ class CLIManager:
         )
         self.verbosity_handler(quiet, verbose)
 
+        if not wallet_name:
+            wallet_name = Prompt.ask(
+                "Enter the [blue]origin wallet name[/blue]",
+                default=self.config.get("wallet_name") or defaults.wallet.name,
+            )
         wallet = self.wallet_ask(
-            wallet_name,
-            wallet_path,
-            wallet_hotkey,
-            ask_for=[WO.NAME, WO.PATH, WO.HOTKEY],
-            validate=WV.WALLET_AND_HOTKEY,
+            wallet_name, wallet_path, wallet_hotkey, ask_for=[WO.NAME]
         )
 
+        if not wallet_hotkey:
+            origin_hotkey = Prompt.ask(
+                "Enter the [blue]origin hotkey[/blue] name or "
+                "[blue]ss58 address[/blue] where the stake will be moved from",
+                default=self.config.get("wallet_hotkey") or defaults.wallet.hotkey,
+            )
+            if is_valid_ss58_address(origin_hotkey):
+                origin_hotkey = origin_hotkey
+            else:
+                wallet = self.wallet_ask(
+                    wallet_name,
+                    wallet_path,
+                    origin_hotkey,
+                    ask_for=[WO.NAME, WO.PATH, WO.HOTKEY],
+                    validate=WV.WALLET_AND_HOTKEY,
+                )
+                origin_hotkey = wallet.hotkey.ss58_address
+        else:
+            if is_valid_ss58_address(wallet_hotkey):
+                origin_hotkey = wallet_hotkey
+            else:
+                wallet = self.wallet_ask(
+                    wallet_name,
+                    wallet_path,
+                    wallet_hotkey,
+                    ask_for=[],
+                    validate=WV.WALLET_AND_HOTKEY,
+                )
+                origin_hotkey = wallet.hotkey.ss58_address
+
         if not dest_ss58:
             dest_ss58 = Prompt.ask(
                 "Enter the [blue]destination wallet name[/blue] or [blue]coldkey SS58 address[/blue]"
@@ -3567,6 +3609,7 @@ class CLIManager:
             move_stake.transfer_stake(
                 wallet=wallet,
                 subtensor=self.initialize_chain(network),
+                origin_hotkey=origin_hotkey,
                 origin_netuid=origin_netuid,
                 dest_netuid=dest_netuid,
                 dest_coldkey_ss58=dest_ss58,
@@ -3961,7 +4004,7 @@ class CLIManager:
         param_name: str = typer.Option(
             "", "--param", "--parameter", help="The subnet hyperparameter to set"
         ),
-        param_value: str = typer.Option(
+        param_value: Optional[str] = typer.Option(
             "", "--value", help="Value to set the hyperparameter to."
         ),
         quiet: bool = Options.quiet,
@@ -4010,9 +4053,12 @@ class CLIManager:
             param_value = f"{low_val},{high_val}"
 
         if not param_value:
-            param_value = Prompt.ask(
-                f"Enter the new value for [{COLOR_PALETTE['GENERAL']['SUBHEADING']}]{param_name}[/{COLOR_PALETTE['GENERAL']['SUBHEADING']}] in the VALUE column format"
-            )
+            if HYPERPARAMS.get(param_name):
+                param_value = Prompt.ask(
+                    f"Enter the new value for [{COLOR_PALETTE['GENERAL']['SUBHEADING']}]{param_name}[/{COLOR_PALETTE['GENERAL']['SUBHEADING']}] in the VALUE column format"
+                )
+            else:
+                param_value = None
 
         wallet = self.wallet_ask(
             wallet_name, wallet_path, wallet_hotkey, ask_for=[WO.NAME, WO.PATH]

bittensor_cli/src/__init__.py

@@ -672,7 +672,7 @@ HYPERPARAMS = {
     "commit_reveal_weights_enabled": ("sudo_set_commit_reveal_weights_enabled", False),
     "alpha_values": ("sudo_set_alpha_values", False),
     "liquid_alpha_enabled": ("sudo_set_liquid_alpha_enabled", False),
-    "network_registration_allowed": ("sudo_set_network_registration_allowed", False),
+    "registration_allowed": ("sudo_set_network_registration_allowed", False),
     "network_pow_registration_allowed": (
         "sudo_set_network_pow_registration_allowed",
         False,

bittensor_cli/src/bittensor/balances.py

@@ -76,7 +76,7 @@ class Balance:
         if self.unit == UNITS[0]:
             return f"{self.unit} {float(self.tao):,.4f}"
         else:
-            return f"{float(self.tao):,.4f} {self.unit}\u200e"
+            return f"\u200e{float(self.tao):,.4f} {self.unit}\u200e"
 
     def __rich__(self):
         return "[green]{}[/green][green]{}[/green][green].[/green][dim green]{}[/dim green]".format(

bittensor_cli/src/bittensor/chain_data.py

@@ -156,7 +156,7 @@ class SubnetHyperparameters(InfoBase):
     def _fix_decoded(
         cls, decoded: Union[dict, "SubnetHyperparameters"]
     ) -> "SubnetHyperparameters":
-        return SubnetHyperparameters(
+        return cls(
             rho=decoded.get("rho"),
             kappa=decoded.get("kappa"),
             immunity_period=decoded.get("immunity_period"),
@@ -197,6 +197,7 @@ class StakeInfo(InfoBase):
     stake: Balance  # Stake for the hotkey-coldkey pair
     locked: Balance  # Stake which is locked.
     emission: Balance  # Emission for the hotkey-coldkey pair
+    tao_emission: Balance  # TAO emission for the hotkey-coldkey pair
     drain: int
     is_registered: bool
 
@@ -208,11 +209,20 @@ class StakeInfo(InfoBase):
         stake = Balance.from_rao(decoded.get("stake")).set_unit(netuid)
         locked = Balance.from_rao(decoded.get("locked")).set_unit(netuid)
         emission = Balance.from_rao(decoded.get("emission")).set_unit(netuid)
+        tao_emission = Balance.from_rao(decoded.get("tao_emission"))
         drain = int(decoded.get("drain"))
         is_registered = bool(decoded.get("is_registered"))
 
-        return StakeInfo(
-            hotkey, coldkey, netuid, stake, locked, emission, drain, is_registered
+        return cls(
+            hotkey,
+            coldkey,
+            netuid,
+            stake,
+            locked,
+            emission,
+            tao_emission,
+            drain,
+            is_registered,
         )
 
 
@@ -293,7 +303,7 @@ class NeuronInfo(InfoBase):
         axon_info = decoded.get("axon_info", {})
         coldkey = decode_account_id(decoded.get("coldkey"))
         hotkey = decode_account_id(decoded.get("hotkey"))
-        return NeuronInfo(
+        return cls(
             hotkey=hotkey,
             coldkey=coldkey,
             uid=decoded.get("uid"),
@@ -555,7 +565,7 @@ class SubnetInfo(InfoBase):
 
     @classmethod
     def _fix_decoded(cls, decoded: "SubnetInfo") -> "SubnetInfo":
-        return SubnetInfo(
+        return cls(
             netuid=decoded.get("netuid"),
             rho=decoded.get("rho"),
             kappa=decoded.get("kappa"),
@@ -594,7 +604,7 @@ class SubnetIdentity(InfoBase):
 
     @classmethod
     def _fix_decoded(cls, decoded: dict) -> "SubnetIdentity":
-        return SubnetIdentity(
+        return cls(
             subnet_name=bytes(decoded["subnet_name"]).decode(),
             github_repo=bytes(decoded["github_repo"]).decode(),
             subnet_contact=bytes(decoded["subnet_contact"]).decode(),
@@ -828,7 +838,7 @@ class SubnetState(InfoBase):
     @classmethod
     def _fix_decoded(cls, decoded: Any) -> "SubnetState":
         netuid = decoded.get("netuid")
-        return SubnetState(
+        return cls(
             netuid=netuid,
             hotkeys=[decode_account_id(val) for val in decoded.get("hotkeys")],
             coldkeys=[decode_account_id(val) for val in decoded.get("coldkeys")],

bittensor_cli/src/bittensor/subtensor_interface.py

@@ -112,8 +112,8 @@ class SubtensorInterface:
             f"[yellow]Connecting to Substrate:[/yellow][bold white] {self}..."
         ):
             try:
-                async with self.substrate:
-                    return self
+                await self.substrate.initialize()
+                return self
             except TimeoutError:  # TODO verify
                 err_console.print(
                     "\n[red]Error[/red]: Timeout occurred connecting to substrate. "
@@ -352,7 +352,7 @@ class SubtensorInterface:
         *ss58_addresses,
         block_hash: Optional[str] = None,
         reuse_block: bool = False,
-    ) -> dict[str, Balance]:
+    ) -> dict[str, tuple[Balance, Balance]]:
         """
         Returns the total stake held on a coldkey.
 
@@ -370,7 +370,8 @@ class SubtensorInterface:
 
         results = {}
         for ss58, stake_info_list in sub_stakes.items():
-            all_staked_tao = 0
+            total_tao_value = Balance(0)
+            total_swapped_tao_value = Balance(0)
             for sub_stake in stake_info_list:
                 if sub_stake.stake.rao == 0:
                     continue
@@ -381,19 +382,20 @@ class SubtensorInterface:
                     netuid
                 )
 
-                tao_locked = pool.tao_in
-
-                issuance = pool.alpha_out if pool.is_dynamic else tao_locked
-                tao_ownership = Balance(0)
+                # Without slippage
+                tao_value = pool.alpha_to_tao(alpha_value)
+                total_tao_value += tao_value
 
-                if alpha_value.tao > 0.00009 and issuance.tao != 0:
-                    tao_ownership = Balance.from_tao(
-                        (alpha_value.tao / issuance.tao) * tao_locked.tao
+                # With slippage
+                if netuid == 0:
+                    swapped_tao_value = tao_value
+                else:
+                    swapped_tao_value, _, _ = pool.alpha_to_tao_with_slippage(
+                        sub_stake.stake
                     )
+                total_swapped_tao_value += swapped_tao_value
 
-                all_staked_tao += tao_ownership.rao
-
-            results[ss58] = Balance.from_rao(all_staked_tao)
+            results[ss58] = (total_tao_value, total_swapped_tao_value)
         return results
 
     async def get_total_stake_for_hotkey(
@@ -1325,20 +1327,29 @@ class SubtensorInterface:
         This function is useful for analyzing the stake distribution and delegation patterns of multiple
         accounts simultaneously, offering a broader perspective on network participation and investment strategies.
         """
-        result = await self.query_runtime_api(
-            runtime_api="StakeInfoRuntimeApi",
-            method="get_stake_info_for_coldkeys",
-            params=[coldkey_ss58_list],
-            block_hash=block_hash,
-        )
-        if result is None:
-            return None
+        BATCH_SIZE = 60
 
+        tasks = []
+        for i in range(0, len(coldkey_ss58_list), BATCH_SIZE):
+            ss58_chunk = coldkey_ss58_list[i : i + BATCH_SIZE]
+            tasks.append(
+                self.query_runtime_api(
+                    runtime_api="StakeInfoRuntimeApi",
+                    method="get_stake_info_for_coldkeys",
+                    params=[ss58_chunk],
+                    block_hash=block_hash,
+                )
+            )
+        results = await asyncio.gather(*tasks)
         stake_info_map = {}
-        for coldkey_bytes, stake_info_list in result:
-            coldkey_ss58 = decode_account_id(coldkey_bytes)
-            stake_info_map[coldkey_ss58] = StakeInfo.list_from_any(stake_info_list)
-        return stake_info_map
+        for result in results:
+            if result is None:
+                continue
+            for coldkey_bytes, stake_info_list in result:
+                coldkey_ss58 = decode_account_id(coldkey_bytes)
+                stake_info_map[coldkey_ss58] = StakeInfo.list_from_any(stake_info_list)
+
+        return stake_info_map if stake_info_map else None
 
     async def all_subnets(self, block_hash: Optional[str] = None) -> list[DynamicInfo]:
         result = await self.query_runtime_api(

bittensor_cli/src/commands/stake/add.py

@@ -17,6 +17,7 @@ from bittensor_cli.src.bittensor.utils import (
     is_valid_ss58_address,
     print_error,
     print_verbose,
+    unlock_key,
 )
 from bittensor_wallet import Wallet
 from bittensor_wallet.errors import KeyFileError
@@ -107,9 +108,7 @@ async def stake_add(
                 )
                 return
             else:
-                err_out(
-                    f"\n{failure_prelude} with error: {format_error_message(e)}"
-                )
+                err_out(f"\n{failure_prelude} with error: {format_error_message(e)}")
             return
         else:
             await response.process_events()
@@ -180,9 +179,7 @@ async def stake_add(
                 extrinsic, wait_for_inclusion=True, wait_for_finalization=False
             )
         except SubstrateRequestException as e:
-            err_out(
-                f"\n{failure_prelude} with error: {format_error_message(e)}"
-            )
+            err_out(f"\n{failure_prelude} with error: {format_error_message(e)}")
             return
         else:
             await response.process_events()
@@ -342,10 +339,7 @@ async def stake_add(
     if prompt:
         if not Confirm.ask("Would you like to continue?"):
             raise typer.Exit()
-    try:
-        wallet.unlock_coldkey()
-    except KeyFileError:
-        err_console.print("Error decrypting coldkey (possibly incorrect password)")
+    if not unlock_key(wallet).success:
         return False
 
     if safe_staking:

bittensor_cli/src/commands/stake/children_hotkeys.py

@@ -256,7 +256,7 @@ async def get_childkey_take(subtensor, hotkey: str, netuid: int) -> Optional[int
             params=[hotkey, netuid],
         )
         if childkey_take_:
-            return int(childkey_take_.value)
+            return int(childkey_take_)
 
     except SubstrateRequestException as e:
         err_console.print(f"Error querying ChildKeys: {format_error_message(e)}")
@@ -671,6 +671,8 @@ async def childkey_take(
         chk_take = await get_childkey_take(
             subtensor=subtensor, netuid=netuid, hotkey=ss58
         )
+        if chk_take is None:
+            chk_take = 0
         chk_take = u16_to_float(chk_take)
         console.print(
             f"Child take for {ss58} is: {chk_take * 100:.2f}% on netuid {netuid}."