Allows user to set era period in all stake transactions. Still need to add tests.

Author: thewhaleking

bittensor_cli/cli.py

@@ -279,6 +279,9 @@ class Options:
         "--dashboard.path",
         help="Path to save the dashboard HTML file. For example: `~/.bittensor/dashboard`.",
     )
+    era = typer.Option(
+        3, help="Length (in blocks) for which the transaction should be valid."
+    )
 
 
 def list_prompt(init_var: list, list_type: type, help_text: str) -> list:
@@ -3112,6 +3115,7 @@ def stake_add(
         rate_tolerance: Optional[float] = Options.rate_tolerance,
         safe_staking: Optional[bool] = Options.safe_staking,
         allow_partial_stake: Optional[bool] = Options.allow_partial_stake,
+        era: int = Options.era,
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
@@ -3305,6 +3309,7 @@ def stake_add(
                 safe_staking,
                 rate_tolerance,
                 allow_partial_stake,
+                era,
             )
         )
 
@@ -3356,6 +3361,7 @@ def stake_remove(
         rate_tolerance: Optional[float] = Options.rate_tolerance,
         safe_staking: Optional[bool] = Options.safe_staking,
         allow_partial_stake: Optional[bool] = Options.allow_partial_stake,
+        era: int = Options.era,
         prompt: bool = Options.prompt,
         interactive: bool = typer.Option(
             False,
@@ -3545,6 +3551,7 @@ def stake_remove(
                     include_hotkeys=include_hotkeys,
                     exclude_hotkeys=exclude_hotkeys,
                     prompt=prompt,
+                    era=era,
                 )
             )
         elif (
@@ -3599,6 +3606,7 @@ def stake_remove(
                 safe_staking=safe_staking,
                 rate_tolerance=rate_tolerance,
                 allow_partial_stake=allow_partial_stake,
+                era=era,
             )
         )
 
@@ -3626,6 +3634,7 @@ def stake_move(
         stake_all: bool = typer.Option(
             False, "--stake-all", "--all", help="Stake all", prompt=False
         ),
+        era: int = Options.era,
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
@@ -3753,6 +3762,7 @@ def stake_move(
                 destination_hotkey=destination_hotkey,
                 amount=amount,
                 stake_all=stake_all,
+                era=era,
                 interactive_selection=interactive_selection,
                 prompt=prompt,
             )
@@ -3790,6 +3800,7 @@ def stake_transfer(
         stake_all: bool = typer.Option(
             False, "--stake-all", "--all", help="Stake all", prompt=False
         ),
+        era: int = Options.era,
         prompt: bool = Options.prompt,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
@@ -3910,6 +3921,7 @@ def stake_transfer(
                 dest_netuid=dest_netuid,
                 dest_coldkey_ss58=dest_ss58,
                 amount=amount,
+                era=era,
                 interactive_selection=interactive_selection,
                 stake_all=stake_all,
                 prompt=prompt,
@@ -3948,6 +3960,7 @@ def stake_swap(
             "--all",
             help="Swap all available stake",
         ),
+        era: int = Options.era,
         prompt: bool = Options.prompt,
         wait_for_inclusion: bool = Options.wait_for_inclusion,
         wait_for_finalization: bool = Options.wait_for_finalization,
@@ -4010,6 +4023,7 @@ def stake_swap(
                 destination_netuid=dest_netuid,
                 amount=amount,
                 swap_all=swap_all,
+                era=era,
                 interactive_selection=interactive_selection,
                 prompt=prompt,
                 wait_for_inclusion=wait_for_inclusion,

bittensor_cli/src/commands/stake/add.py

@@ -38,6 +38,7 @@ async def stake_add(
     safe_staking: bool,
     rate_tolerance: float,
     allow_partial_stake: bool,
+    era: int,
 ):
     """
     Args:
@@ -53,6 +54,7 @@ async def stake_add(
         safe_staking: whether to use safe staking
         rate_tolerance: rate tolerance percentage for stake operations
         allow_partial_stake: whether to allow partial stake
+        era: Blocks for which the transaction should be valid.
 
     Returns:
         bool: True if stake operation is successful, False otherwise
@@ -86,7 +88,7 @@ async def safe_stake_extrinsic(
             },
         )
         extrinsic = await subtensor.substrate.create_signed_extrinsic(
-            call=call, keypair=wallet.coldkey, nonce=next_nonce
+            call=call, keypair=wallet.coldkey, nonce=next_nonce, era={"period": era}
         )
         try:
             response = await subtensor.substrate.submit_extrinsic(
@@ -105,7 +107,6 @@ async def safe_stake_extrinsic(
                 err_out(f"\n{failure_prelude} with error: {format_error_message(e)}")
             return
         else:
-            await response.process_events()
             if not await response.is_success:
                 err_out(
                     f"\n{failure_prelude} with error: {format_error_message(await response.error_message)}"
@@ -166,7 +167,7 @@ async def stake_extrinsic(
             },
         )
         extrinsic = await subtensor.substrate.create_signed_extrinsic(
-            call=call, keypair=wallet.coldkey, nonce=next_nonce
+            call=call, keypair=wallet.coldkey, nonce=next_nonce, era={"period": era}
         )
         try:
             response = await subtensor.substrate.submit_extrinsic(

bittensor_cli/src/commands/stake/move.py

@@ -444,6 +444,7 @@ async def move_stake(
     destination_hotkey: str,
     amount: float,
     stake_all: bool,
+    era: int,
     interactive_selection: bool = False,
     prompt: bool = True,
 ):
@@ -563,7 +564,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
@@ -622,6 +623,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,
@@ -747,7 +749,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(
@@ -798,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,
@@ -917,7 +920,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(

bittensor_cli/src/commands/stake/remove.py

@@ -41,6 +41,7 @@ async def unstake(
     safe_staking: bool,
     rate_tolerance: float,
     allow_partial_stake: bool,
+    era: int,
 ):
     """Unstake from hotkey(s)."""
     with console.status(
@@ -302,6 +303,7 @@ async def unstake(
                         current_stake=op["current_stake_balance"],
                         hotkey_ss58=op["hotkey_ss58"],
                         status=status,
+                        era=era,
                     )
                 else:
                     await _safe_unstake_extrinsic(
@@ -313,6 +315,7 @@ async def unstake(
                         price_limit=op["price_with_tolerance"],
                         allow_partial_stake=allow_partial_stake,
                         status=status,
+                        era=era,
                     )
         else:
             for op in unstake_operations:
@@ -324,6 +327,7 @@ async def unstake(
                     current_stake=op["current_stake_balance"],
                     hotkey_ss58=op["hotkey_ss58"],
                     status=status,
+                    era=era,
                 )
     console.print(
         f"[{COLOR_PALETTE['STAKE']['STAKE_AMOUNT']}]Unstaking operations completed."
@@ -338,6 +342,7 @@ async def unstake_all(
     all_hotkeys: bool = False,
     include_hotkeys: Optional[list[str]] = None,
     exclude_hotkeys: Optional[list[str]] = None,
+    era: int = 3,
     prompt: bool = True,
 ) -> bool:
     """Unstakes all stakes from all hotkeys in all subnets."""
@@ -512,6 +517,7 @@ async def unstake_all(
                 hotkey_name=hotkey_names.get(hotkey_ss58, hotkey_ss58),
                 unstake_all_alpha=unstake_all_alpha,
                 status=status,
+                era=era,
             )
 
 
@@ -524,6 +530,7 @@ async def _unstake_extrinsic(
     current_stake: Balance,
     hotkey_ss58: str,
     status=None,
+    era: int = 3,
 ) -> None:
     """Execute a standard unstake extrinsic.
 
@@ -535,6 +542,7 @@ async def _unstake_extrinsic(
         wallet: Wallet instance
         subtensor: Subtensor interface
         status: Optional status for console updates
+        era: blocks for which the transaction is valid
     """
     err_out = partial(print_error, status=status)
     failure_prelude = (
@@ -557,7 +565,7 @@ async def _unstake_extrinsic(
         },
     )
     extrinsic = await subtensor.substrate.create_signed_extrinsic(
-        call=call, keypair=wallet.coldkey
+        call=call, keypair=wallet.coldkey, era={"period": era}
     )
 
     try:
@@ -607,6 +615,7 @@ async def _safe_unstake_extrinsic(
     price_limit: Balance,
     allow_partial_stake: bool,
     status=None,
+    era: int = 3,
 ) -> None:
     """Execute a safe unstake extrinsic with price limit.
 
@@ -655,7 +664,7 @@ async def _safe_unstake_extrinsic(
     )
 
     extrinsic = await subtensor.substrate.create_signed_extrinsic(
-        call=call, keypair=wallet.coldkey, nonce=next_nonce
+        call=call, keypair=wallet.coldkey, nonce=next_nonce, era={"period": era}
     )
 
     try:
@@ -720,6 +729,7 @@ async def _unstake_all_extrinsic(
     hotkey_name: str,
     unstake_all_alpha: bool,
     status=None,
+    era: int = 3,
 ) -> None:
     """Execute an unstake all extrinsic.
 
@@ -770,8 +780,7 @@ async def _unstake_all_extrinsic(
     try:
         response = await subtensor.substrate.submit_extrinsic(
             extrinsic=await subtensor.substrate.create_signed_extrinsic(
-                call=call,
-                keypair=wallet.coldkey,
+                call=call, keypair=wallet.coldkey, era={"period": era}
             ),
             wait_for_inclusion=True,
             wait_for_finalization=False,

tests/e2e_tests/test_senate.py

@@ -222,9 +222,10 @@ def test_senate(local_chain, wallet_setup):
     assert proposals_after_nay_output[9].split()[4] == "1"
 
     # Assert Alice has voted Nay
-    assert proposals_after_nay_output[10].split()[0].strip(
-        ":"
-    ) == wallet_alice.hotkey.ss58_address
+    assert (
+        proposals_after_nay_output[10].split()[0].strip(":")
+        == wallet_alice.hotkey.ss58_address
+    )
 
     # Assert vote casted as Nay
     assert proposals_after_nay_output[10].split()[1] == "Nay"