bittensor-cli 9.8.7__py3-none-any.whl → 9.10.0__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

@@ -26,9 +26,9 @@ async def transfer_extrinsic(
     amount: Balance,
     era: int = 3,
     transfer_all: bool = False,
+    allow_death: bool = False,
     wait_for_inclusion: bool = True,
     wait_for_finalization: bool = False,
-    keep_alive: bool = True,
     prompt: bool = False,
 ) -> bool:
     """Transfers funds from this wallet to the destination public key address.
@@ -39,11 +39,11 @@ async def transfer_extrinsic(
     :param amount: Amount to stake as Bittensor balance.
     :param era: Length (in blocks) for which the transaction should be valid.
     :param transfer_all: Whether to transfer all funds from this wallet to the destination address.
+    :param allow_death: Whether to allow for falling below the existential deposit when performing this transfer.
     :param wait_for_inclusion: If set, waits for the extrinsic to enter a block before returning `True`,
                                or returns `False` if the extrinsic fails to enter the block within the timeout.
     :param wait_for_finalization:  If set, waits for the extrinsic to be finalized on the chain before returning
                                    `True`, or returns `False` if the extrinsic fails to be finalized within the timeout.
-    :param keep_alive: If set, keeps the account alive by keeping the balance above the existential deposit.
     :param prompt: If `True`, the call waits for confirmation from the user before proceeding.
     :return: success: Flag is `True` if extrinsic was finalized or included in the block. If we did not wait for
                       finalization / inclusion, the response is `True`, regardless of its inclusion.
@@ -57,8 +57,8 @@ async def transfer_extrinsic(
         """
         call = await subtensor.substrate.compose_call(
             call_module="Balances",
-            call_function="transfer_keep_alive",
-            call_params={"dest": destination, "value": amount.rao},
+            call_function=call_function,
+            call_params=call_params,
         )
 
         try:
@@ -82,8 +82,8 @@ async def transfer_extrinsic(
         """
         call = await subtensor.substrate.compose_call(
             call_module="Balances",
-            call_function="transfer_keep_alive",
-            call_params={"dest": destination, "value": amount.rao},
+            call_function=call_function,
+            call_params=call_params,
         )
         extrinsic = await subtensor.substrate.create_signed_extrinsic(
             call=call, keypair=wallet.coldkey, era={"period": era}
@@ -115,6 +115,20 @@ async def transfer_extrinsic(
     if not unlock_key(wallet).success:
         return False
 
+    call_params = {"dest": destination}
+    if transfer_all:
+        call_function = "transfer_all"
+        if allow_death:
+            call_params["keep_alive"] = False
+        else:
+            call_params["keep_alive"] = True
+    else:
+        call_params["value"] = amount.rao
+        if allow_death:
+            call_function = "transfer_allow_death"
+        else:
+            call_function = "transfer_keep_alive"
+
     # Check balance.
     with console.status(
         f":satellite: Checking balance and fees on chain [white]{subtensor.network}[/white]",
@@ -131,23 +145,26 @@ async def transfer_extrinsic(
         )
         fee = await get_transfer_fee()
 
-    if not keep_alive:
-        # Check if the transfer should keep_alive the account
+    if allow_death:
+        # Check if the transfer should keep alive the account
         existential_deposit = Balance(0)
 
-    # Check if we have enough balance.
-    if transfer_all is True:
-        amount = account_balance - fee - existential_deposit
-        if amount < Balance(0):
-            print_error("Not enough balance to transfer")
-            return False
-
-    if account_balance < (amount + fee + existential_deposit):
+    if account_balance < (amount + fee + existential_deposit) and not allow_death:
         err_console.print(
             ":cross_mark: [bold red]Not enough balance[/bold red]:\n\n"
             f"  balance: [bright_cyan]{account_balance}[/bright_cyan]\n"
             f"  amount: [bright_cyan]{amount}[/bright_cyan]\n"
-            f"  for fee: [bright_cyan]{fee}[/bright_cyan]"
+            f"  for fee: [bright_cyan]{fee}[/bright_cyan]\n"
+            f"   would bring you under the existential deposit: [bright_cyan]{existential_deposit}[/bright_cyan].\n"
+            f"You can try again with `--allow-death`."
+        )
+        return False
+    elif account_balance < (amount + fee) and allow_death:
+        print_error(
+            ":cross_mark: [bold red]Not enough balance[/bold red]:\n\n"
+            f"  balance: [bright_red]{account_balance}[/bright_red]\n"
+            f"  amount: [bright_red]{amount}[/bright_red]\n"
+            f"  for fee: [bright_red]{fee}[/bright_red]"
         )
         return False
 
@@ -155,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

@@ -3,7 +3,9 @@ import os
 from typing import Optional, Any, Union, TypedDict, Iterable
 
 import aiohttp
+from async_substrate_interface.utils.storage import StorageKey
 from bittensor_wallet import Wallet
+from bittensor_wallet.bittensor_wallet import Keypair
 from bittensor_wallet.utils import SS58_FORMAT
 from scalecodec import GenericCall
 from async_substrate_interface.errors import SubstrateRequestException
@@ -37,6 +39,7 @@ from bittensor_cli.src.bittensor.utils import (
     validate_chain_endpoint,
     u16_normalized_float,
     U16_MAX,
+    get_hotkey_pub_ss58,
 )
 
 SubstrateClass = (
@@ -664,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,
                     )
@@ -881,9 +884,10 @@ class SubtensorInterface:
             storage_function="IdentitiesV2",
             block_hash=block_hash,
             reuse_block_hash=reuse_block,
+            fully_exhaust=True,
         )
         all_identities = {}
-        async for ss58_address, identity in identities:
+        for ss58_address, identity in identities.records:
             all_identities[decode_account_id(ss58_address[0])] = decode_hex_identity(
                 identity.value
             )
@@ -939,22 +943,22 @@ class SubtensorInterface:
         :param reuse_block: Whether to reuse the last-used blockchain block hash.
         :return: Dict with 'coldkeys' and 'hotkeys' as keys.
         """
-
-        coldkey_identities = await self.query_all_identities()
+        if block_hash is None:
+            block_hash = await self.substrate.get_chain_head()
+        coldkey_identities = await self.query_all_identities(block_hash=block_hash)
         identities = {"coldkeys": {}, "hotkeys": {}}
-        if not coldkey_identities:
-            return identities
-        query = await self.substrate.query_multiple(  # TODO probably more efficient to do this with query_multi
-            params=list(coldkey_identities.keys()),
-            module="SubtensorModule",
-            storage_function="OwnedHotkeys",
-            block_hash=block_hash,
-            reuse_block_hash=reuse_block,
-        )
+        sks = [
+            await self.substrate.create_storage_key(
+                "SubtensorModule", "OwnedHotkeys", [ck], block_hash=block_hash
+            )
+            for ck in coldkey_identities.keys()
+        ]
+        query = await self.substrate.query_multi(sks, block_hash=block_hash)
 
-        for coldkey_ss58, hotkeys in query.items():
+        storage_key: StorageKey
+        for storage_key, hotkeys in query:
+            coldkey_ss58 = storage_key.params[0]
             coldkey_identity = coldkey_identities.get(coldkey_ss58)
-            hotkeys = [decode_account_id(hotkey[0]) for hotkey in hotkeys or []]
 
             identities["coldkeys"][coldkey_ss58] = {
                 "identity": coldkey_identity,
@@ -1455,6 +1459,8 @@ class SubtensorInterface:
             ),
             self.get_subnet_price(netuid=netuid, block_hash=block_hash),
         )
+        if not result:
+            raise ValueError(f"Subnet {netuid} not found")
         subnet_ = DynamicInfo.from_any(result)
         subnet_.price = price
         return subnet_
@@ -1484,6 +1490,19 @@ class SubtensorInterface:
 
         return [decode_account_id(hotkey[0]) for hotkey in owned_hotkeys or []]
 
+    async def get_extrinsic_fee(self, call: GenericCall, keypair: Keypair) -> Balance:
+        """
+        Determines the fee for the extrinsic call.
+        Args:
+            call: Created extrinsic call
+            keypair: The keypair that would sign the extrinsic (usually you would just want to use the *pub for this)
+
+        Returns:
+            Balance object representing the fee for this extrinsic.
+        """
+        fee_dict = await self.substrate.get_payment_info(call, keypair)
+        return Balance.from_rao(fee_dict["partial_fee"])
+
     async def get_stake_fee(
         self,
         origin_hotkey_ss58: Optional[str],

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 (
@@ -1431,3 +1431,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:
+        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
 
@@ -65,6 +66,45 @@ async def stake_add(
         bool: True if stake operation is successful, False otherwise
     """
 
+    async def get_stake_extrinsic_fee(
+        netuid_: int,
+        amount_: Balance,
+        staking_address_: str,
+        safe_staking_: bool,
+        price_limit: Optional[Balance] = None,
+    ):
+        """
+        Quick method to get the extrinsic fee for adding stake depending on the args supplied.
+        Args:
+            netuid_: The netuid where the stake will be added
+            amount_: the amount of stake to add
+            staking_address_: the hotkey ss58 to stake to
+            safe_staking_: whether to use safe staking
+            price_limit: rate with tolerance
+
+        Returns:
+            Balance object representing the extrinsic fee for adding stake.
+        """
+        call_fn = "add_stake" if not safe_staking_ else "add_stake_limit"
+        call_params = {
+            "hotkey": staking_address_,
+            "netuid": netuid_,
+            "amount_staked": amount_.rao,
+        }
+        if safe_staking_:
+            call_params.update(
+                {
+                    "limit_price": price_limit,
+                    "allow_partial": allow_partial_stake,
+                }
+            )
+        call = await subtensor.substrate.compose_call(
+            call_module="SubtensorModule",
+            call_function=call_fn,
+            call_params=call_params,
+        )
+        return await subtensor.get_extrinsic_fee(call, wallet.coldkeypub)
+
     async def safe_stake_extrinsic(
         netuid_: int,
         amount_: Balance,
@@ -87,7 +127,7 @@ async def stake_add(
                     "hotkey": hotkey_ss58_,
                     "netuid": netuid_,
                     "amount_staked": amount_.rao,
-                    "limit_price": price_limit,
+                    "limit_price": price_limit.rao,
                     "allow_partial": allow_partial_stake,
                 },
             ),
@@ -332,19 +372,6 @@ async def stake_add(
             # Temporary workaround - calculations without slippage
             current_price_float = float(subnet_info.price.tao)
             rate = 1.0 / current_price_float
-            received_amount = rate * amount_to_stake
-
-            # Add rows for the table
-            base_row = [
-                str(netuid),  # netuid
-                f"{hotkey[1]}",  # hotkey
-                str(amount_to_stake),  # amount
-                str(rate)
-                + f" {Balance.get_unit(netuid)}/{Balance.get_unit(0)} ",  # rate
-                str(received_amount.set_unit(netuid)),  # received
-                str(stake_fee),  # fee
-                # str(slippage_pct),  # slippage
-            ]
 
             # If we are staking safe, add price tolerance
             if safe_staking:
@@ -356,21 +383,45 @@ async def stake_add(
                     rate_with_tolerance = f"{_rate_with_tolerance:.4f}"
                     price_with_tolerance = Balance.from_tao(
                         price_with_tolerance
-                    ).rao  # Actual price to pass to extrinsic
+                    )  # Actual price to pass to extrinsic
                 else:
                     rate_with_tolerance = "1"
                     price_with_tolerance = Balance.from_rao(1)
+                extrinsic_fee = await get_stake_extrinsic_fee(
+                    netuid_=netuid,
+                    amount_=amount_to_stake,
+                    staking_address_=hotkey[1],
+                    safe_staking_=safe_staking,
+                    price_limit=price_with_tolerance,
+                )
                 prices_with_tolerance.append(price_with_tolerance)
-
-                base_row.extend(
-                    [
-                        f"{rate_with_tolerance} {Balance.get_unit(netuid)}/{Balance.get_unit(0)} ",
-                        f"[{'dark_sea_green3' if allow_partial_stake else 'red'}]"
-                        # safe staking
-                        f"{allow_partial_stake}[/{'dark_sea_green3' if allow_partial_stake else 'red'}]",
-                    ]
+                row_extension = [
+                    f"{rate_with_tolerance} {Balance.get_unit(netuid)}/{Balance.get_unit(0)} ",
+                    f"[{'dark_sea_green3' if allow_partial_stake else 'red'}]"
+                    # safe staking
+                    f"{allow_partial_stake}[/{'dark_sea_green3' if allow_partial_stake else 'red'}]",
+                ]
+            else:
+                extrinsic_fee = await get_stake_extrinsic_fee(
+                    netuid_=netuid,
+                    amount_=amount_to_stake,
+                    staking_address_=hotkey[1],
+                    safe_staking_=safe_staking,
                 )
-
+                row_extension = []
+            received_amount = rate * (amount_to_stake - stake_fee - extrinsic_fee)
+            # Add rows for the table
+            base_row = [
+                str(netuid),  # netuid
+                f"{hotkey[1]}",  # hotkey
+                str(amount_to_stake),  # amount
+                str(rate)
+                + f" {Balance.get_unit(netuid)}/{Balance.get_unit(0)} ",  # rate
+                str(received_amount.set_unit(netuid)),  # received
+                str(stake_fee),  # fee
+                str(extrinsic_fee),
+                # str(slippage_pct),  # slippage
+            ] + row_extension
             rows.append(tuple(base_row))
 
     # Define and print stake table + slippage warning
@@ -502,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 [])
         ]
@@ -522,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
 
@@ -531,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(
@@ -569,17 +620,17 @@ def _define_stake_table(
         "Hotkey", justify="center", style=COLOR_PALETTE["GENERAL"]["HOTKEY"]
     )
     table.add_column(
-        f"Amount ({Balance.get_unit(0)})",
+        "Amount (τ)",
         justify="center",
         style=COLOR_PALETTE["POOLS"]["TAO"],
     )
     table.add_column(
-        f"Rate (per {Balance.get_unit(0)})",
+        "Rate (per τ)",
         justify="center",
         style=COLOR_PALETTE["POOLS"]["RATE"],
     )
     table.add_column(
-        "Received",
+        "Est. Received",
         justify="center",
         style=COLOR_PALETTE["POOLS"]["TAO_EQUIV"],
     )
@@ -588,6 +639,11 @@ def _define_stake_table(
         justify="center",
         style=COLOR_PALETTE["STAKE"]["STAKE_AMOUNT"],
     )
+    table.add_column(
+        "Extrinsic Fee (τ)",
+        justify="center",
+        style=COLOR_PALETTE.STAKE.TAO,
+    )
     # TODO: Uncomment when slippage is reimplemented for v3
     # table.add_column(
     #     "Slippage", justify="center", style=COLOR_PALETTE["STAKE"]["SLIPPAGE_PERCENT"]