bittensor-cli 9.8.7__py3-none-any.whl → 9.10.0__py3-none-any.whl

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:
@@ -33,12 +34,15 @@ async def display_stake_movement_cross_subnets(
     destination_hotkey: str,
     amount_to_move: Balance,
     stake_fee: Balance,
+    extrinsic_fee: Balance,
 ) -> tuple[Balance, str]:
     """Calculate and display stake movement information"""
 
     if origin_netuid == destination_netuid:
         subnet = await subtensor.subnet(origin_netuid)
-        received_amount_tao = subnet.alpha_to_tao(amount_to_move - stake_fee)
+        received_amount_tao = (
+            subnet.alpha_to_tao(amount_to_move - stake_fee) - extrinsic_fee
+        )
         received_amount = subnet.tao_to_alpha(received_amount_tao)
 
         if received_amount < Balance.from_tao(0).set_unit(destination_netuid):
@@ -62,7 +66,9 @@ async def display_stake_movement_cross_subnets(
         price_destination = dynamic_destination.price.tao
         rate = price_origin / (price_destination or 1)
 
-        received_amount_tao = dynamic_origin.alpha_to_tao(amount_to_move - stake_fee)
+        received_amount_tao = (
+            dynamic_origin.alpha_to_tao(amount_to_move - stake_fee) - extrinsic_fee
+        )
         received_amount = dynamic_destination.tao_to_alpha(received_amount_tao)
         received_amount.set_unit(destination_netuid)
 
@@ -81,14 +87,14 @@ async def display_stake_movement_cross_subnets(
     # Create and display table
     table = Table(
         title=(
-            f"\n[{COLOR_PALETTE['GENERAL']['HEADER']}]"
+            f"\n[{COLOR_PALETTE.G.HEADER}]"
             f"Moving stake from: "
-            f"[{COLOR_PALETTE['GENERAL']['SUBHEADING']}]{Balance.get_unit(origin_netuid)}(Netuid: {origin_netuid})"
-            f"[/{COLOR_PALETTE['GENERAL']['SUBHEADING']}] "
+            f"[{COLOR_PALETTE.G.SUBHEAD}]{Balance.get_unit(origin_netuid)}(Netuid: {origin_netuid})"
+            f"[/{COLOR_PALETTE.G.SUBHEAD}] "
             f"to: "
-            f"[{COLOR_PALETTE['GENERAL']['SUBHEADING']}]{Balance.get_unit(destination_netuid)}(Netuid: {destination_netuid})"
-            f"[/{COLOR_PALETTE['GENERAL']['SUBHEADING']}]\nNetwork: {subtensor.network}\n"
-            f"[/{COLOR_PALETTE['GENERAL']['HEADER']}]"
+            f"[{COLOR_PALETTE.G.SUBHEAD}]{Balance.get_unit(destination_netuid)}(Netuid: {destination_netuid})"
+            f"[/{COLOR_PALETTE.G.SUBHEAD}]\nNetwork: {subtensor.network}\n"
+            f"[/{COLOR_PALETTE.G.HEADER}]"
         ),
         show_footer=True,
         show_edge=False,
@@ -132,6 +138,9 @@ async def display_stake_movement_cross_subnets(
         justify="center",
         style=COLOR_PALETTE["STAKE"]["STAKE_AMOUNT"],
     )
+    table.add_column(
+        "Extrinsic Fee (τ)", justify="center", style=COLOR_PALETTE.STAKE.TAO
+    )
 
     table.add_row(
         f"{Balance.get_unit(origin_netuid)}({origin_netuid})",
@@ -142,6 +151,7 @@ async def display_stake_movement_cross_subnets(
         price_str,
         str(received_amount),
         str(stake_fee.set_unit(origin_netuid)),
+        str(extrinsic_fee),
     )
 
     console.print(table)
@@ -165,10 +175,10 @@ def prompt_stake_amount(
     while True:
         amount_input = Prompt.ask(
             f"\nEnter the amount to {action_name} "
-            f"[{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{Balance.get_unit(netuid)}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}] "
-            f"[{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}](max: {current_balance})[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}] "
+            f"[{COLOR_PALETTE.S.STAKE_AMOUNT}]{Balance.get_unit(netuid)}[/{COLOR_PALETTE.S.STAKE_AMOUNT}] "
+            f"[{COLOR_PALETTE.S.STAKE_AMOUNT}](max: {current_balance})[/{COLOR_PALETTE.S.STAKE_AMOUNT}] "
             f"or "
-            f"[{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]'all'[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}] "
+            f"[{COLOR_PALETTE.S.STAKE_AMOUNT}]'all'[/{COLOR_PALETTE.S.STAKE_AMOUNT}] "
             f"for entire balance"
         )
 
@@ -183,7 +193,7 @@ def prompt_stake_amount(
             if amount > current_balance.tao:
                 console.print(
                     f"[red]Amount exceeds available balance of "
-                    f"[{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{current_balance}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
+                    f"[{COLOR_PALETTE.S.STAKE_AMOUNT}]{current_balance}[/{COLOR_PALETTE.S.STAKE_AMOUNT}]"
                     f"[/red]"
                 )
                 continue
@@ -270,8 +280,8 @@ async def stake_move_transfer_selection(
 
     # Display available netuids for selected hotkey
     table = Table(
-        title=f"\n[{COLOR_PALETTE['GENERAL']['HEADER']}]Available Stakes for Hotkey\n[/{COLOR_PALETTE['GENERAL']['HEADER']}]"
-        f"[{COLOR_PALETTE['GENERAL']['HOTKEY']}]{origin_hotkey_ss58}[/{COLOR_PALETTE['GENERAL']['HOTKEY']}]\n",
+        title=f"\n[{COLOR_PALETTE.G.HEADER}]Available Stakes for Hotkey\n[/{COLOR_PALETTE.G.HEADER}]"
+        f"[{COLOR_PALETTE.G.HK}]{origin_hotkey_ss58}[/{COLOR_PALETTE.G.HK}]\n",
         show_edge=False,
         header_style="bold white",
         border_style="bright_black",
@@ -279,7 +289,7 @@ async def stake_move_transfer_selection(
         width=len(origin_hotkey_ss58) + 20,
     )
     table.add_column("Netuid", style="cyan")
-    table.add_column("Stake Amount", style=COLOR_PALETTE["STAKE"]["STAKE_AMOUNT"])
+    table.add_column("Stake Amount", style=COLOR_PALETTE.STAKE.STAKE_AMOUNT)
 
     available_netuids = []
     for netuid in origin_hotkey_info["netuids"]:
@@ -334,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,
@@ -347,13 +358,13 @@ async def stake_swap_selection(
 
     # Display available stakes
     table = Table(
-        title=f"\n[{COLOR_PALETTE['GENERAL']['HEADER']}]Available Stakes for Hotkey\n[/{COLOR_PALETTE['GENERAL']['HEADER']}]"
-        f"[{COLOR_PALETTE['GENERAL']['HOTKEY']}]{wallet.hotkey_str}: {wallet.hotkey.ss58_address}[/{COLOR_PALETTE['GENERAL']['HOTKEY']}]\n",
+        title=f"\n[{COLOR_PALETTE.G.HEADER}]Available Stakes for Hotkey\n[/{COLOR_PALETTE.G.HEADER}]"
+        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")
@@ -366,7 +377,7 @@ async def stake_swap_selection(
     for idx, (netuid, stake_info) in enumerate(sorted(hotkey_stakes.items())):
         subnet_info = subnet_dict[netuid]
         subnet_name_cell = (
-            f"[{COLOR_PALETTE['GENERAL']['SYMBOL']}]{subnet_info.symbol if netuid != 0 else 'τ'}[/{COLOR_PALETTE['GENERAL']['SYMBOL']}]"
+            f"[{COLOR_PALETTE.G.SYM}]{subnet_info.symbol if netuid != 0 else 'τ'}[/{COLOR_PALETTE.G.SYM}]"
             f" {get_subnet_name(subnet_info)}"
         )
 
@@ -498,14 +509,28 @@ async def move_stake(
         )
         return False
 
-    stake_fee = await subtensor.get_stake_fee(
-        origin_hotkey_ss58=origin_hotkey,
-        origin_netuid=origin_netuid,
-        origin_coldkey_ss58=wallet.coldkeypub.ss58_address,
-        destination_hotkey_ss58=destination_hotkey,
-        destination_netuid=destination_netuid,
-        destination_coldkey_ss58=wallet.coldkeypub.ss58_address,
-        amount=amount_to_move_as_balance.rao,
+    call = await subtensor.substrate.compose_call(
+        call_module="SubtensorModule",
+        call_function="move_stake",
+        call_params={
+            "origin_hotkey": origin_hotkey,
+            "origin_netuid": origin_netuid,
+            "destination_hotkey": destination_hotkey,
+            "destination_netuid": destination_netuid,
+            "alpha_amount": amount_to_move_as_balance.rao,
+        },
+    )
+    stake_fee, extrinsic_fee = await asyncio.gather(
+        subtensor.get_stake_fee(
+            origin_hotkey_ss58=origin_hotkey,
+            origin_netuid=origin_netuid,
+            origin_coldkey_ss58=wallet.coldkeypub.ss58_address,
+            destination_hotkey_ss58=destination_hotkey,
+            destination_netuid=destination_netuid,
+            destination_coldkey_ss58=wallet.coldkeypub.ss58_address,
+            amount=amount_to_move_as_balance.rao,
+        ),
+        subtensor.get_extrinsic_fee(call, wallet.coldkeypub),
     )
 
     # Display stake movement details
@@ -519,6 +544,7 @@ async def move_stake(
                 destination_hotkey=destination_hotkey,
                 amount_to_move=amount_to_move_as_balance,
                 stake_fee=stake_fee,
+                extrinsic_fee=extrinsic_fee,
             )
         except ValueError:
             return False
@@ -529,20 +555,10 @@ async def move_stake(
     if not unlock_key(wallet).success:
         return False
     with console.status(
-        f"\n:satellite: Moving [blue]{amount_to_move_as_balance}[/blue] from [blue]{origin_hotkey}[/blue] on netuid: [blue]{origin_netuid}[/blue] \nto "
+        f"\n:satellite: Moving [blue]{amount_to_move_as_balance}[/blue] from [blue]{origin_hotkey}[/blue] on netuid: "
+        f"[blue]{origin_netuid}[/blue] \nto "
         f"[blue]{destination_hotkey}[/blue] on netuid: [blue]{destination_netuid}[/blue] ..."
     ):
-        call = await subtensor.substrate.compose_call(
-            call_module="SubtensorModule",
-            call_function="move_stake",
-            call_params={
-                "origin_hotkey": origin_hotkey,
-                "origin_netuid": origin_netuid,
-                "destination_hotkey": destination_hotkey,
-                "destination_netuid": destination_netuid,
-                "alpha_amount": amount_to_move_as_balance.rao,
-            },
-        )
         extrinsic = await subtensor.substrate.create_signed_extrinsic(
             call=call, keypair=wallet.coldkey, era={"period": era}
         )
@@ -677,19 +693,33 @@ async def transfer_stake(
     if amount_to_transfer > current_stake:
         err_console.print(
             f"[red]Not enough stake to transfer[/red]:\n"
-            f"Stake balance: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{current_stake}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}] < "
-            f"Transfer amount: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{amount_to_transfer}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
+            f"Stake balance: [{COLOR_PALETTE.S.STAKE_AMOUNT}]{current_stake}[/{COLOR_PALETTE.S.STAKE_AMOUNT}] < "
+            f"Transfer amount: [{COLOR_PALETTE.S.STAKE_AMOUNT}]{amount_to_transfer}[/{COLOR_PALETTE.S.STAKE_AMOUNT}]"
         )
         return False
 
-    stake_fee = await subtensor.get_stake_fee(
-        origin_hotkey_ss58=origin_hotkey,
-        origin_netuid=origin_netuid,
-        origin_coldkey_ss58=wallet.coldkeypub.ss58_address,
-        destination_hotkey_ss58=origin_hotkey,
-        destination_netuid=dest_netuid,
-        destination_coldkey_ss58=dest_coldkey_ss58,
-        amount=amount_to_transfer.rao,
+    call = await subtensor.substrate.compose_call(
+        call_module="SubtensorModule",
+        call_function="transfer_stake",
+        call_params={
+            "destination_coldkey": dest_coldkey_ss58,
+            "hotkey": origin_hotkey,
+            "origin_netuid": origin_netuid,
+            "destination_netuid": dest_netuid,
+            "alpha_amount": amount_to_transfer.rao,
+        },
+    )
+    stake_fee, extrinsic_fee = await asyncio.gather(
+        subtensor.get_stake_fee(
+            origin_hotkey_ss58=origin_hotkey,
+            origin_netuid=origin_netuid,
+            origin_coldkey_ss58=wallet.coldkeypub.ss58_address,
+            destination_hotkey_ss58=origin_hotkey,
+            destination_netuid=dest_netuid,
+            destination_coldkey_ss58=dest_coldkey_ss58,
+            amount=amount_to_transfer.rao,
+        ),
+        subtensor.get_extrinsic_fee(call, wallet.coldkeypub),
     )
 
     # Display stake movement details
@@ -703,6 +733,7 @@ async def transfer_stake(
                 destination_hotkey=origin_hotkey,
                 amount_to_move=amount_to_transfer,
                 stake_fee=stake_fee,
+                extrinsic_fee=extrinsic_fee,
             )
         except ValueError:
             return False
@@ -715,18 +746,6 @@ async def transfer_stake(
         return False
 
     with console.status("\n:satellite: Transferring stake ..."):
-        call = await subtensor.substrate.compose_call(
-            call_module="SubtensorModule",
-            call_function="transfer_stake",
-            call_params={
-                "destination_coldkey": dest_coldkey_ss58,
-                "hotkey": origin_hotkey,
-                "origin_netuid": origin_netuid,
-                "destination_netuid": dest_netuid,
-                "alpha_amount": amount_to_transfer.rao,
-            },
-        )
-
         extrinsic = await subtensor.substrate.create_signed_extrinsic(
             call=call, keypair=wallet.coldkey, era={"period": era}
         )
@@ -800,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)
@@ -846,19 +865,32 @@ async def swap_stake(
     if amount_to_swap > current_stake:
         err_console.print(
             f"[red]Not enough stake to swap[/red]:\n"
-            f"Stake balance: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{current_stake}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}] < "
-            f"Swap amount: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{amount_to_swap}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
+            f"Stake balance: [{COLOR_PALETTE.S.STAKE_AMOUNT}]{current_stake}[/{COLOR_PALETTE.S.STAKE_AMOUNT}] < "
+            f"Swap amount: [{COLOR_PALETTE.S.STAKE_AMOUNT}]{amount_to_swap}[/{COLOR_PALETTE.S.STAKE_AMOUNT}]"
         )
         return False
 
-    stake_fee = await subtensor.get_stake_fee(
-        origin_hotkey_ss58=hotkey_ss58,
-        origin_netuid=origin_netuid,
-        origin_coldkey_ss58=wallet.coldkeypub.ss58_address,
-        destination_hotkey_ss58=hotkey_ss58,
-        destination_netuid=destination_netuid,
-        destination_coldkey_ss58=wallet.coldkeypub.ss58_address,
-        amount=amount_to_swap.rao,
+    call = await subtensor.substrate.compose_call(
+        call_module="SubtensorModule",
+        call_function="swap_stake",
+        call_params={
+            "hotkey": hotkey_ss58,
+            "origin_netuid": origin_netuid,
+            "destination_netuid": destination_netuid,
+            "alpha_amount": amount_to_swap.rao,
+        },
+    )
+    stake_fee, extrinsic_fee = await asyncio.gather(
+        subtensor.get_stake_fee(
+            origin_hotkey_ss58=hotkey_ss58,
+            origin_netuid=origin_netuid,
+            origin_coldkey_ss58=wallet.coldkeypub.ss58_address,
+            destination_hotkey_ss58=hotkey_ss58,
+            destination_netuid=destination_netuid,
+            destination_coldkey_ss58=wallet.coldkeypub.ss58_address,
+            amount=amount_to_swap.rao,
+        ),
+        subtensor.get_extrinsic_fee(call, wallet.coldkeypub),
     )
 
     # Display stake movement details
@@ -872,6 +904,7 @@ async def swap_stake(
                 destination_hotkey=hotkey_ss58,
                 amount_to_move=amount_to_swap,
                 stake_fee=stake_fee,
+                extrinsic_fee=extrinsic_fee,
             )
         except ValueError:
             return False
@@ -887,17 +920,6 @@ async def swap_stake(
         f"\n:satellite: Swapping stake from netuid [blue]{origin_netuid}[/blue] "
         f"to netuid [blue]{destination_netuid}[/blue]..."
     ):
-        call = await subtensor.substrate.compose_call(
-            call_module="SubtensorModule",
-            call_function="swap_stake",
-            call_params={
-                "hotkey": hotkey_ss58,
-                "origin_netuid": origin_netuid,
-                "destination_netuid": destination_netuid,
-                "alpha_amount": amount_to_swap.rao,
-            },
-        )
-
         extrinsic = await subtensor.substrate.create_signed_extrinsic(
             call=call, keypair=wallet.coldkey, era={"period": era}
         )