bittensor-cli 9.9.0__py3-none-any.whl → 9.10.1__py3-none-any.whl

bittensor_cli/src/bittensor/extrinsics/registration.py

@@ -39,6 +39,7 @@ from bittensor_cli.src.bittensor.utils import (
     print_error,
     unlock_key,
     hex_to_bytes,
+    get_hotkey_pub_ss58,
 )
 
 if typing.TYPE_CHECKING:
@@ -490,7 +491,7 @@ async def register_extrinsic(
 
     async def get_neuron_for_pubkey_and_subnet():
         uid = await subtensor.query(
-            "SubtensorModule", "Uids", [netuid, wallet.hotkey.ss58_address]
+            "SubtensorModule", "Uids", [netuid, get_hotkey_pub_ss58(wallet)]
         )
         if uid is None:
             return NeuronInfo.get_null_neuron()
@@ -525,7 +526,7 @@ async def register_extrinsic(
         if not Confirm.ask(
             f"Continue Registration?\n"
             f"  hotkey [{COLOR_PALETTE.G.HK}]({wallet.hotkey_str})[/{COLOR_PALETTE.G.HK}]:"
-            f"\t[{COLOR_PALETTE.G.HK}]{wallet.hotkey.ss58_address}[/{COLOR_PALETTE.G.HK}]\n"
+            f"\t[{COLOR_PALETTE.G.HK}]{get_hotkey_pub_ss58(wallet)}[/{COLOR_PALETTE.G.HK}]\n"
             f"  coldkey [{COLOR_PALETTE.G.CK}]({wallet.name})[/{COLOR_PALETTE.G.CK}]:"
             f"\t[{COLOR_PALETTE.G.CK}]{wallet.coldkeypub.ss58_address}[/{COLOR_PALETTE.G.CK}]\n"
             f"  network:\t\t[{COLOR_PALETTE.G.LINKS}]{subtensor.network}[/{COLOR_PALETTE.G.LINKS}]\n"
@@ -577,7 +578,7 @@ async def register_extrinsic(
         if not pow_result:
             # might be registered already on this subnet
             is_registered = await is_hotkey_registered(
-                subtensor, netuid=netuid, hotkey_ss58=wallet.hotkey.ss58_address
+                subtensor, netuid=netuid, hotkey_ss58=get_hotkey_pub_ss58(wallet)
             )
             if is_registered:
                 err_console.print(
@@ -598,7 +599,7 @@ async def register_extrinsic(
                             "block_number": pow_result.block_number,
                             "nonce": pow_result.nonce,
                             "work": [int(byte_) for byte_ in pow_result.seal],
-                            "hotkey": wallet.hotkey.ss58_address,
+                            "hotkey": get_hotkey_pub_ss58(wallet),
                             "coldkey": wallet.coldkeypub.ss58_address,
                         },
                     )
@@ -639,7 +640,7 @@ async def register_extrinsic(
                         is_registered = await is_hotkey_registered(
                             subtensor,
                             netuid=netuid,
-                            hotkey_ss58=wallet.hotkey.ss58_address,
+                            hotkey_ss58=get_hotkey_pub_ss58(wallet),
                         )
                         if is_registered:
                             console.print(
@@ -704,7 +705,7 @@ async def burned_register_extrinsic(
         spinner="aesthetic",
     ) as status:
         my_uid = await subtensor.query(
-            "SubtensorModule", "Uids", [netuid, wallet.hotkey.ss58_address]
+            "SubtensorModule", "Uids", [netuid, get_hotkey_pub_ss58(wallet)]
         )
         block_hash = await subtensor.substrate.get_chain_head()
 
@@ -751,7 +752,7 @@ async def burned_register_extrinsic(
             call_function="burned_register",
             call_params={
                 "netuid": netuid,
-                "hotkey": wallet.hotkey.ss58_address,
+                "hotkey": get_hotkey_pub_ss58(wallet),
             },
         )
         success, err_msg = await subtensor.sign_and_send_extrinsic(
@@ -773,10 +774,10 @@ async def burned_register_extrinsic(
                     reuse_block=False,
                 ),
                 subtensor.get_netuids_for_hotkey(
-                    wallet.hotkey.ss58_address, block_hash=block_hash
+                    get_hotkey_pub_ss58(wallet), block_hash=block_hash
                 ),
                 subtensor.query(
-                    "SubtensorModule", "Uids", [netuid, wallet.hotkey.ss58_address]
+                    "SubtensorModule", "Uids", [netuid, get_hotkey_pub_ss58(wallet)]
                 ),
             )
 
@@ -1146,7 +1147,7 @@ async def _block_solver(
 
     timeout = 0.15 if cuda else 0.15
     while netuid == -1 or not await is_hotkey_registered(
-        subtensor, netuid, wallet.hotkey.ss58_address
+        subtensor, netuid, get_hotkey_pub_ss58(wallet)
     ):
         # Wait until a solver finds a solution
         try:
@@ -1755,37 +1756,39 @@ async def swap_hotkey_extrinsic(
     :return: Success
     """
     block_hash = await subtensor.substrate.get_chain_head()
+    hk_ss58 = get_hotkey_pub_ss58(wallet)
     netuids_registered = await subtensor.get_netuids_for_hotkey(
-        wallet.hotkey.ss58_address, block_hash=block_hash
+        hk_ss58, block_hash=block_hash
     )
     netuids_registered_new_hotkey = await subtensor.get_netuids_for_hotkey(
-        new_wallet.hotkey.ss58_address, block_hash=block_hash
+        hk_ss58, 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}"
+            f":cross_mark: [red]Failed[/red]: Original hotkey {hk_ss58} is not registered on subnet {netuid}"
         )
         return False
 
     elif not len(netuids_registered) > 0:
         err_console.print(
-            f"Original hotkey [dark_orange]{wallet.hotkey.ss58_address}[/dark_orange] is not registered on any subnet. "
+            f"Original hotkey [dark_orange]{hk_ss58}[/dark_orange] is not registered on any subnet. "
             f"Please register and try again"
         )
         return False
 
+    new_hk_ss58 = get_hotkey_pub_ss58(new_wallet)
     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":cross_mark: [red]Failed[/red]: New hotkey {new_hk_ss58} "
                 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":cross_mark: [red]Failed[/red]: New hotkey {new_hk_ss58} "
                 f"is already registered on subnet(s) {netuids_registered_new_hotkey}"
             )
             return False
@@ -1798,28 +1801,28 @@ async def swap_hotkey_extrinsic(
         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"
+                f"[dark_orange]{hk_ss58} ({wallet.hotkey_str})[/dark_orange] with hotkey \n\t"
+                f"[dark_orange]{new_hk_ss58} ({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"
+                f"[dark_orange]{hk_ss58} ({wallet.hotkey_str})[/dark_orange] with hotkey \n\t"
+                f"[dark_orange]{new_hk_ss58} ({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} - {wallet.hotkey_str}) with "
-        f"{new_wallet.name}'s hotkey ({new_wallet.hotkey.ss58_address} - {new_wallet.hotkey_str})"
+        f"Swapping {wallet.name}'s hotkey ({hk_ss58} - {wallet.hotkey_str}) with "
+        f"{new_wallet.name}'s hotkey ({new_hk_ss58} - {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,
+            "hotkey": hk_ss58,
+            "new_hotkey": new_hk_ss58,
             "netuid": netuid,
         }
 
@@ -1832,7 +1835,8 @@ async def swap_hotkey_extrinsic(
 
         if success:
             console.print(
-                f"Hotkey {wallet.hotkey.ss58_address} ({wallet.hotkey_str}) swapped for new hotkey: {new_wallet.hotkey.ss58_address} ({new_wallet.hotkey_str})"
+                f"Hotkey {hk_ss58} ({wallet.hotkey_str}) swapped for new hotkey: "
+                f"{new_hk_ss58} ({new_wallet.hotkey_str})"
             )
             return True
         else:

bittensor_cli/src/bittensor/extrinsics/root.py

@@ -37,6 +37,7 @@ from bittensor_cli.src.bittensor.utils import (
     print_verbose,
     format_error_message,
     unlock_key,
+    get_hotkey_pub_ss58,
 )
 
 if TYPE_CHECKING:
@@ -310,7 +311,7 @@ async def root_register_extrinsic(
 
     print_verbose(f"Checking if hotkey ({wallet.hotkey_str}) is registered on root")
     is_registered = await is_hotkey_registered(
-        subtensor, netuid=0, hotkey_ss58=wallet.hotkey.ss58_address
+        subtensor, netuid=0, hotkey_ss58=get_hotkey_pub_ss58(wallet)
     )
     if is_registered:
         console.print(
@@ -322,7 +323,7 @@ async def root_register_extrinsic(
         call = await subtensor.substrate.compose_call(
             call_module="SubtensorModule",
             call_function="root_register",
-            call_params={"hotkey": wallet.hotkey.ss58_address},
+            call_params={"hotkey": get_hotkey_pub_ss58(wallet)},
         )
         success, err_msg = await subtensor.sign_and_send_extrinsic(
             call,
@@ -341,7 +342,7 @@ async def root_register_extrinsic(
             uid = await subtensor.query(
                 module="SubtensorModule",
                 storage_function="Uids",
-                params=[0, wallet.hotkey.ss58_address],
+                params=[0, get_hotkey_pub_ss58(wallet)],
             )
             if uid is not None:
                 console.print(
@@ -391,7 +392,7 @@ async def set_root_weights_extrinsic(
                 "weights": weight_vals,
                 "netuid": 0,
                 "version_key": version_key,
-                "hotkey": wallet.hotkey.ss58_address,
+                "hotkey": get_hotkey_pub_ss58(wallet),
             },
         )
         # Period dictates how long the extrinsic will stay as part of waiting pool
@@ -415,7 +416,7 @@ async def set_root_weights_extrinsic(
             return False, await response.error_message
 
     my_uid = await subtensor.query(
-        "SubtensorModule", "Uids", [0, wallet.hotkey.ss58_address]
+        "SubtensorModule", "Uids", [0, get_hotkey_pub_ss58(wallet)]
     )
 
     if my_uid is None:

bittensor_cli/src/bittensor/extrinsics/transfer.py

@@ -172,7 +172,7 @@ async def transfer_extrinsic(
     if prompt:
         if not Confirm.ask(
             "Do you want to transfer:[bold white]\n"
-            f"  amount: [bright_cyan]{amount}[/bright_cyan]\n"
+            f"  amount: [bright_cyan]{amount if not transfer_all else account_balance}[/bright_cyan]\n"
             f"  from: [light_goldenrod2]{wallet.name}[/light_goldenrod2] : "
             f"[bright_magenta]{wallet.coldkey.ss58_address}\n[/bright_magenta]"
             f"  to: [bright_magenta]{destination}[/bright_magenta]\n  for fee: [bright_cyan]{fee}[/bright_cyan]"

bittensor_cli/src/bittensor/subtensor_interface.py

@@ -39,6 +39,7 @@ from bittensor_cli.src.bittensor.utils import (
     validate_chain_endpoint,
     u16_normalized_float,
     U16_MAX,
+    get_hotkey_pub_ss58,
 )
 
 SubstrateClass = (
@@ -666,7 +667,7 @@ class SubtensorInterface:
             for sublist in await asyncio.gather(
                 *[
                     self.get_netuids_for_hotkey(
-                        wallet.hotkey.ss58_address,
+                        get_hotkey_pub_ss58(wallet),
                         reuse_block=reuse_block,
                         block_hash=block_hash,
                     )

bittensor_cli/src/bittensor/utils.py

@@ -275,7 +275,7 @@ def get_hotkey_wallets_for_wallet(
                 (exists := hotkey_for_name.hotkey_file.exists_on_device())
                 and not hotkey_for_name.hotkey_file.is_encrypted()
                 # and hotkey_for_name.coldkeypub.ss58_address
-                and hotkey_for_name.hotkey.ss58_address
+                and get_hotkey_pub_ss58(hotkey_for_name)
             ):
                 hotkey_wallets.append(hotkey_for_name)
             elif (
@@ -575,7 +575,9 @@ def format_error_message(error_message: Union[dict, Exception]) -> str:
             err_type = error_message.get("type", err_type)
             err_name = error_message.get("name", err_name)
             err_docs = error_message.get("docs", [err_description])
-            err_description = " ".join(err_docs)
+            err_description = (
+                " ".join(err_docs) if not isinstance(err_docs, str) else err_docs
+            )
             err_description += (
                 f" | Please consult {BT_DOCS_LINK}/errors/subtensor#{err_name.lower()}"
             )
@@ -1431,3 +1433,15 @@ def blocks_to_duration(blocks: int) -> str:
             results.append(f"{unit_count}{unit}")
     # Return only the first two non-zero units
     return " ".join(results[:2]) or "0s"
+
+
+def get_hotkey_pub_ss58(wallet: Wallet) -> str:
+    """
+    Helper fn to retrieve the hotkeypub ss58 of a wallet that may have been created before
+    bt-wallet 3.1.1 and thus not have a wallet hotkeypub. In this case, it will return the hotkey
+    SS58.
+    """
+    try:
+        return wallet.hotkeypub.ss58_address
+    except (KeyFileError, AttributeError):
+        return wallet.hotkey.ss58_address

bittensor_cli/src/commands/stake/add.py

@@ -20,6 +20,7 @@ from bittensor_cli.src.bittensor.utils import (
     print_verbose,
     unlock_key,
     json_console,
+    get_hotkey_pub_ss58,
 )
 from bittensor_wallet import Wallet
 
@@ -552,7 +553,7 @@ def _get_hotkeys_to_stake_to(
         # Stake to all hotkeys except excluded ones
         all_hotkeys_: list[Wallet] = get_hotkey_wallets_for_wallet(wallet=wallet)
         return [
-            (wallet.hotkey_str, wallet.hotkey.ss58_address)
+            (wallet.hotkey_str, get_hotkey_pub_ss58(wallet))
             for wallet in all_hotkeys_
             if wallet.hotkey_str not in (exclude_hotkeys or [])
         ]
@@ -572,7 +573,7 @@ def _get_hotkeys_to_stake_to(
                     name=wallet.name,
                     hotkey=hotkey_ss58_or_hotkey_name,
                 )
-                hotkeys.append((wallet_.hotkey_str, wallet_.hotkey.ss58_address))
+                hotkeys.append((wallet_.hotkey_str, get_hotkey_pub_ss58(wallet_)))
 
         return hotkeys
 
@@ -581,7 +582,7 @@ def _get_hotkeys_to_stake_to(
         f"Staking to hotkey: ({wallet.hotkey_str}) in wallet: ({wallet.name})"
     )
     assert wallet.hotkey is not None
-    return [(None, wallet.hotkey.ss58_address)]
+    return [(None, get_hotkey_pub_ss58(wallet))]
 
 
 def _define_stake_table(

bittensor_cli/src/commands/stake/children_hotkeys.py

@@ -21,6 +21,7 @@ from bittensor_cli.src.bittensor.utils import (
     format_error_message,
     unlock_key,
     json_console,
+    get_hotkey_pub_ss58,
 )
 
 
@@ -464,7 +465,7 @@ async def get_children(
         netuid_children_tuples = []
         for netuid_ in netuids:
             success, children, err_mg = await subtensor.get_children(
-                wallet.hotkey.ss58_address, netuid_
+                get_hotkey_pub_ss58(wallet), netuid_
             )
             if children:
                 netuid_children_tuples.append((netuid_, children))
@@ -472,16 +473,16 @@ async def get_children(
                 err_console.print(
                     f"Failed to get children from subtensor {netuid_}: {err_mg}"
                 )
-        await _render_table(wallet.hotkey.ss58_address, netuid_children_tuples)
+        await _render_table(get_hotkey_pub_ss58(wallet), netuid_children_tuples)
     else:
         success, children, err_mg = await subtensor.get_children(
-            wallet.hotkey.ss58_address, netuid
+            get_hotkey_pub_ss58(wallet), netuid
         )
         if not success:
             err_console.print(f"Failed to get children from subtensor: {err_mg}")
         if children:
             netuid_children_tuples = [(netuid, children)]
-            await _render_table(wallet.hotkey.ss58_address, netuid_children_tuples)
+            await _render_table(get_hotkey_pub_ss58(wallet), netuid_children_tuples)
 
         return children
 
@@ -500,12 +501,12 @@ async def set_children(
     """Set children hotkeys."""
     # Validate children SS58 addresses
     # TODO check to see if this should be allowed to be specified by user instead of pulling from wallet
-    hotkey = wallet.hotkey.ss58_address
+    hotkey = get_hotkey_pub_ss58(wallet)
     for child in children:
         if not is_valid_ss58_address(child):
             err_console.print(f":cross_mark:[red] Invalid SS58 address: {child}[/red]")
             return
-        if child == wallet.hotkey.ss58_address:
+        if child == hotkey:
             err_console.print(":cross_mark:[red] Cannot set yourself as a child.[/red]")
             return
 
@@ -608,7 +609,7 @@ async def revoke_children(
             subtensor=subtensor,
             wallet=wallet,
             netuid=netuid,
-            hotkey=wallet.hotkey.ss58_address,
+            hotkey=get_hotkey_pub_ss58(wallet),
             children_with_proportions=[],
             prompt=prompt,
             wait_for_inclusion=wait_for_inclusion,
@@ -647,7 +648,7 @@ async def revoke_children(
                 subtensor=subtensor,
                 wallet=wallet,
                 netuid=netuid,
-                hotkey=wallet.hotkey.ss58_address,
+                hotkey=get_hotkey_pub_ss58(wallet),
                 children_with_proportions=[],
                 prompt=prompt,
                 wait_for_inclusion=True,
@@ -746,7 +747,7 @@ async def childkey_take(
             subtensor=subtensor,
             wallet=wallet,
             netuid=subnet,
-            hotkey=wallet.hotkey.ss58_address,
+            hotkey=get_hotkey_pub_ss58(wallet),
             take=chk_take,
             prompt=prompt,
             wait_for_inclusion=wait_for_inclusion,
@@ -756,7 +757,7 @@ async def childkey_take(
         if success:
             console.print(":white_heavy_check_mark: [green]Set childkey take.[/green]")
             console.print(
-                f"The childkey take for {wallet.hotkey.ss58_address} is now set to {take * 100:.2f}%."
+                f"The childkey take for {get_hotkey_pub_ss58(wallet)} is now set to {take * 100:.2f}%."
             )
             return True
         else:
@@ -766,9 +767,10 @@ async def childkey_take(
             return False
 
     # Print childkey take for other user and return (dont offer to change take rate)
-    if not hotkey or hotkey == wallet.hotkey.ss58_address:
-        hotkey = wallet.hotkey.ss58_address
-    if hotkey != wallet.hotkey.ss58_address or not take:
+    wallet_hk = get_hotkey_pub_ss58(wallet)
+    if not hotkey or hotkey == wallet_hk:
+        hotkey = wallet_hk
+    if hotkey != wallet_hk or not take:
         # display childkey take for other users
         if netuid:
             await display_chk_take(hotkey, netuid)
@@ -826,7 +828,7 @@ async def childkey_take(
                     subtensor=subtensor,
                     wallet=wallet,
                     netuid=netuid_,
-                    hotkey=wallet.hotkey.ss58_address,
+                    hotkey=wallet_hk,
                     take=take,
                     prompt=prompt,
                     wait_for_inclusion=True,

bittensor_cli/src/commands/stake/move.py

@@ -16,6 +16,7 @@ from bittensor_cli.src.bittensor.utils import (
     group_subnets,
     get_subnet_name,
     unlock_key,
+    get_hotkey_pub_ss58,
 )
 
 if TYPE_CHECKING:
@@ -343,8 +344,9 @@ async def stake_swap_selection(
 
     # Filter stakes for this hotkey
     hotkey_stakes = {}
+    hotkey_ss58 = get_hotkey_pub_ss58(wallet)
     for stake in stakes:
-        if stake.hotkey_ss58 == wallet.hotkey.ss58_address and stake.stake.tao > 0:
+        if stake.hotkey_ss58 == hotkey_ss58 and stake.stake.tao > 0:
             hotkey_stakes[stake.netuid] = {
                 "stake": stake.stake,
                 "is_registered": stake.is_registered,
@@ -357,12 +359,12 @@ async def stake_swap_selection(
     # Display available stakes
     table = Table(
         title=f"\n[{COLOR_PALETTE.G.HEADER}]Available Stakes for Hotkey\n[/{COLOR_PALETTE.G.HEADER}]"
-        f"[{COLOR_PALETTE.G.HK}]{wallet.hotkey_str}: {wallet.hotkey.ss58_address}[/{COLOR_PALETTE.G.HK}]\n",
+        f"[{COLOR_PALETTE.G.HK}]{wallet.hotkey_str}: {hotkey_ss58}[/{COLOR_PALETTE.G.HK}]\n",
         show_edge=False,
         header_style="bold white",
         border_style="bright_black",
         title_justify="center",
-        width=len(wallet.hotkey.ss58_address) + 20,
+        width=len(hotkey_ss58) + 20,
     )
 
     table.add_column("Index", justify="right", style="cyan")
@@ -817,7 +819,7 @@ async def swap_stake(
     Returns:
         bool: True if the swap was successful, False otherwise.
     """
-    hotkey_ss58 = wallet.hotkey.ss58_address
+    hotkey_ss58 = get_hotkey_pub_ss58(wallet)
     if interactive_selection:
         try:
             selection = await stake_swap_selection(subtensor, wallet)

bittensor_cli/src/commands/stake/remove.py

@@ -22,6 +22,7 @@ from bittensor_cli.src.bittensor.utils import (
     group_subnets,
     unlock_key,
     json_console,
+    get_hotkey_pub_ss58,
 )
 
 if TYPE_CHECKING:
@@ -407,7 +408,7 @@ async def unstake_all(
                 old_identities=old_identities,
             )
         elif not hotkey_ss58_address:
-            hotkeys = [(wallet.hotkey_str, wallet.hotkey.ss58_address, None)]
+            hotkeys = [(wallet.hotkey_str, get_hotkey_pub_ss58(wallet), None)]
         else:
             hotkeys = [(None, hotkey_ss58_address, None)]
 
@@ -1198,7 +1199,7 @@ def _get_hotkeys_to_unstake(
         print_verbose("Unstaking from all hotkeys")
         all_hotkeys_ = get_hotkey_wallets_for_wallet(wallet=wallet)
         wallet_hotkeys = [
-            (wallet.hotkey_str, wallet.hotkey.ss58_address, None)
+            (wallet.hotkey_str, get_hotkey_pub_ss58(wallet), None)
             for wallet in all_hotkeys_
             if wallet.hotkey_str not in exclude_hotkeys
         ]
@@ -1230,7 +1231,7 @@ def _get_hotkeys_to_unstake(
                     path=wallet.path,
                     hotkey=hotkey_identifier,
                 )
-                result.append((wallet_.hotkey_str, wallet_.hotkey.ss58_address, None))
+                result.append((wallet_.hotkey_str, get_hotkey_pub_ss58(wallet_), None))
         return result
 
     # Only cli.config.wallet.hotkey is specified
@@ -1238,7 +1239,7 @@ def _get_hotkeys_to_unstake(
         f"Unstaking from wallet: ({wallet.name}) from hotkey: ({wallet.hotkey_str})"
     )
     assert wallet.hotkey is not None
-    return [(wallet.hotkey_str, wallet.hotkey.ss58_address, None)]
+    return [(wallet.hotkey_str, get_hotkey_pub_ss58(wallet), None)]
 
 
 def _create_unstake_table(