bittensor-cli 9.1.4__py3-none-any.whl → 9.3.0__py3-none-any.whl

bittensor_cli/src/commands/stake/move.py

@@ -32,13 +32,14 @@ async def display_stake_movement_cross_subnets(
     origin_hotkey: str,
     destination_hotkey: str,
     amount_to_move: Balance,
+    stake_fee: Balance,
 ) -> tuple[Balance, float, str, str]:
     """Calculate and display slippage information"""
 
     if origin_netuid == destination_netuid:
         subnet = await subtensor.subnet(origin_netuid)
         received_amount_tao = subnet.alpha_to_tao(amount_to_move)
-        received_amount_tao -= MIN_STAKE_FEE
+        received_amount_tao -= stake_fee
 
         if received_amount_tao < Balance.from_tao(0):
             print_error("Not enough Alpha to pay the transaction fee.")
@@ -46,7 +47,7 @@ async def display_stake_movement_cross_subnets(
 
         received_amount = subnet.tao_to_alpha(received_amount_tao)
         slippage_pct_float = (
-            100 * float(MIN_STAKE_FEE) / float(MIN_STAKE_FEE + received_amount_tao)
+            100 * float(stake_fee) / float(stake_fee + received_amount_tao)
             if received_amount_tao != 0
             else 0
         )
@@ -67,7 +68,7 @@ async def display_stake_movement_cross_subnets(
         received_amount_tao, _, _ = dynamic_origin.alpha_to_tao_with_slippage(
             amount_to_move
         )
-        received_amount_tao -= MIN_STAKE_FEE
+        received_amount_tao -= stake_fee
         received_amount, _, _ = dynamic_destination.tao_to_alpha_with_slippage(
             received_amount_tao
         )
@@ -135,6 +136,11 @@ async def display_stake_movement_cross_subnets(
         justify="center",
         style=COLOR_PALETTE["POOLS"]["TAO_EQUIV"],
     )
+    table.add_column(
+        "Fee (τ)",
+        justify="center",
+        style=COLOR_PALETTE["STAKE"]["STAKE_AMOUNT"],
+    )
     table.add_column(
         "slippage",
         justify="center",
@@ -149,13 +155,11 @@ async def display_stake_movement_cross_subnets(
         str(amount_to_move),
         price_str,
         str(received_amount),
+        str(stake_fee),
         str(slippage_pct),
     )
 
     console.print(table)
-    # console.print(
-    #     f"[dim]A fee of {MIN_STAKE_FEE} applies.[/dim]"
-    # )
 
     # Display slippage warning if necessary
     if slippage_pct_float > 5:
@@ -440,9 +444,10 @@ async def move_stake(
     destination_hotkey: str,
     amount: float,
     stake_all: bool,
+    era: int,
     interactive_selection: bool = False,
     prompt: bool = True,
-):
+) -> bool:
     if interactive_selection:
         try:
             selection = await stake_move_transfer_selection(subtensor, wallet)
@@ -508,11 +513,23 @@ async def move_stake(
     if amount_to_move_as_balance > origin_stake_balance:
         err_console.print(
             f"[red]Not enough stake[/red]:\n"
-            f" Stake balance: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{origin_stake_balance}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
-            f" < Moving amount: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{amount_to_move_as_balance}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
+            f" Stake balance: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
+            f"{origin_stake_balance}[/{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
+            f" < Moving amount: [{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]"
+            f"{amount_to_move_as_balance}[/{COLOR_PALETTE['STAKE']['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=destination_hotkey,
+        destination_netuid=destination_netuid,
+        destination_coldkey_ss58=wallet.coldkeypub.ss58_address,
+        amount=amount_to_move_as_balance.rao,
+    )
+
     # Slippage warning
     if prompt:
         try:
@@ -523,6 +540,7 @@ async def move_stake(
                 origin_hotkey=origin_hotkey,
                 destination_hotkey=destination_hotkey,
                 amount_to_move=amount_to_move_as_balance,
+                stake_fee=stake_fee,
             )
         except ValueError:
             return False
@@ -548,7 +566,7 @@ async def move_stake(
             },
         )
         extrinsic = await subtensor.substrate.create_signed_extrinsic(
-            call=call, keypair=wallet.coldkey
+            call=call, keypair=wallet.coldkey, era={"period": era}
         )
         response = await subtensor.substrate.submit_extrinsic(
             extrinsic, wait_for_inclusion=True, wait_for_finalization=False
@@ -558,13 +576,12 @@ async def move_stake(
         console.print(":white_heavy_check_mark: [green]Sent[/green]")
         return True
     else:
-        await response.process_events()
         if not await response.is_success:
             err_console.print(
                 f"\n:cross_mark: [red]Failed[/red] with error:"
                 f" {format_error_message(await response.error_message)}"
             )
-            return
+            return False
         else:
             console.print(
                 ":white_heavy_check_mark: [dark_sea_green3]Stake moved.[/dark_sea_green3]"
@@ -596,7 +613,7 @@ async def move_stake(
                 f"Destination Stake:\n  [blue]{destination_stake_balance}[/blue] :arrow_right: "
                 f"[{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]{new_destination_stake_balance}"
             )
-            return
+            return True
 
 
 async def transfer_stake(
@@ -607,6 +624,7 @@ async def transfer_stake(
     origin_netuid: int,
     dest_netuid: int,
     dest_coldkey_ss58: str,
+    era: int,
     interactive_selection: bool = False,
     stake_all: bool = False,
     prompt: bool = True,
@@ -686,6 +704,16 @@ async def transfer_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=origin_hotkey,
+        destination_netuid=dest_netuid,
+        destination_coldkey_ss58=dest_coldkey_ss58,
+        amount=amount_to_transfer.rao,
+    )
+
     # Slippage warning
     if prompt:
         try:
@@ -696,6 +724,7 @@ async def transfer_stake(
                 origin_hotkey=origin_hotkey,
                 destination_hotkey=origin_hotkey,
                 amount_to_move=amount_to_transfer,
+                stake_fee=stake_fee,
             )
         except ValueError:
             return False
@@ -721,7 +750,7 @@ async def transfer_stake(
         )
 
         extrinsic = await subtensor.substrate.create_signed_extrinsic(
-            call=call, keypair=wallet.coldkey
+            call=call, keypair=wallet.coldkey, era={"period": era}
         )
 
         response = await subtensor.substrate.submit_extrinsic(
@@ -732,7 +761,6 @@ async def transfer_stake(
         console.print(":white_heavy_check_mark: [green]Sent[/green]")
         return True
 
-    await response.process_events()
     if not await response.is_success:
         err_console.print(
             f":cross_mark: [red]Failed[/red] with error: "
@@ -772,6 +800,7 @@ async def swap_stake(
     destination_netuid: int,
     amount: float,
     swap_all: bool = False,
+    era: int = 3,
     interactive_selection: bool = False,
     prompt: bool = True,
     wait_for_inclusion: bool = True,
@@ -844,6 +873,16 @@ async def swap_stake(
         )
         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,
+    )
+
     # Slippage warning
     if prompt:
         try:
@@ -854,6 +893,7 @@ async def swap_stake(
                 origin_hotkey=hotkey_ss58,
                 destination_hotkey=hotkey_ss58,
                 amount_to_move=amount_to_swap,
+                stake_fee=stake_fee,
             )
         except ValueError:
             return False
@@ -866,7 +906,8 @@ async def swap_stake(
         return False
 
     with console.status(
-        f"\n:satellite: Swapping stake from netuid [blue]{origin_netuid}[/blue] to netuid [blue]{destination_netuid}[/blue]..."
+        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",
@@ -880,7 +921,7 @@ async def swap_stake(
         )
 
         extrinsic = await subtensor.substrate.create_signed_extrinsic(
-            call=call, keypair=wallet.coldkey
+            call=call, keypair=wallet.coldkey, era={"period": era}
         )
 
         response = await subtensor.substrate.submit_extrinsic(
@@ -893,7 +934,6 @@ async def swap_stake(
         console.print(":white_heavy_check_mark: [green]Sent[/green]")
         return True
 
-    await response.process_events()
     if not await response.is_success:
         err_console.print(
             f":cross_mark: [red]Failed[/red] with error: "