Merge remote-tracking branch 'origin/bug/roman/make-dynamic-info-backwards-compatable' into bug/roman/make-dynamic-info-backwards-compatable

Author: Roman

bittensor/core/async_subtensor.py

@@ -1951,13 +1951,9 @@ async def get_hotkey_owner(
     async def get_minimum_required_stake(self):
         """
         Returns the minimum required stake for nominators in the Subtensor network.
-        This method retries the substrate call up to three times with exponential backoff in case of failures.
 
         Returns:
             Balance: The minimum required stake as a Balance object.
-
-        Raises:
-            Exception: If the substrate call fails after the maximum number of retries.
         """
         result = await self.substrate.query(
             module="SubtensorModule", storage_function="NominatorMinRequiredStake"

bittensor/core/subtensor.py

@@ -1276,13 +1276,9 @@ def get_hotkey_owner(
     def get_minimum_required_stake(self) -> Balance:
         """
         Returns the minimum required stake for nominators in the Subtensor network.
-        This method retries the substrate call up to three times with exponential backoff in case of failures.
 
         Returns:
-            Balance: The minimum required stake as a Balance object.
-
-        Raises:
-            Exception: If the substrate call fails after the maximum number of retries.
+            The minimum required stake as a Balance object in TAO.
         """
         result = self.substrate.query(
             module="SubtensorModule", storage_function="NominatorMinRequiredStake"

tests/e2e_tests/test_delegate.py

@@ -293,11 +293,13 @@ async def test_delegates(local_chain, subtensor, alice_wallet, bob_wallet):
     bittensor.logging.console.success("Test [green]test_delegates[/green] passed.")
 
 
-def test_nominator_min_required_stake(local_chain, subtensor, alice_wallet, bob_wallet):
+def test_nominator_min_required_stake(
+    local_chain, subtensor, alice_wallet, bob_wallet, dave_wallet
+):
     """
     Tests:
     - Check default NominatorMinRequiredStake
-    - Add Stake to Nominate
+    - Add Stake to Nominate from Dave to Bob
     - Update NominatorMinRequiredStake
     - Check Nominator is removed
     """
@@ -323,15 +325,22 @@ def test_nominator_min_required_stake(local_chain, subtensor, alice_wallet, bob_
     assert minimum_required_stake == Balance(0)
 
     subtensor.burned_register(
-        bob_wallet,
-        alice_subnet_netuid,
+        wallet=bob_wallet,
+        netuid=alice_subnet_netuid,
+        wait_for_inclusion=True,
+        wait_for_finalization=True,
+    )
+
+    subtensor.burned_register(
+        wallet=dave_wallet,
+        netuid=alice_subnet_netuid,
         wait_for_inclusion=True,
         wait_for_finalization=True,
     )
 
     success = subtensor.add_stake(
-        alice_wallet,
-        bob_wallet.hotkey.ss58_address,
+        wallet=dave_wallet,
+        hotkey_ss58=bob_wallet.hotkey.ss58_address,
         netuid=alice_subnet_netuid,
         amount=Balance.from_tao(10_000),
         wait_for_inclusion=True,
@@ -341,17 +350,17 @@ def test_nominator_min_required_stake(local_chain, subtensor, alice_wallet, bob_
     assert success is True
 
     stake = subtensor.get_stake(
-        alice_wallet.coldkey.ss58_address,
-        bob_wallet.hotkey.ss58_address,
+        coldkey_ss58=dave_wallet.coldkey.ss58_address,
+        hotkey_ss58=bob_wallet.hotkey.ss58_address,
         netuid=alice_subnet_netuid,
     )
 
     assert stake > 0
 
     # this will trigger clear_small_nominations
     sudo_set_admin_utils(
-        local_chain,
-        alice_wallet,
+        substrate=local_chain,
+        wallet=alice_wallet,
         call_function="sudo_set_nominator_min_required_stake",
         call_params={
             "min_stake": "100000000000000",
@@ -363,8 +372,8 @@ def test_nominator_min_required_stake(local_chain, subtensor, alice_wallet, bob_
     assert minimum_required_stake == Balance.from_tao(100_000)
 
     stake = subtensor.get_stake(
-        alice_wallet.coldkey.ss58_address,
-        bob_wallet.hotkey.ss58_address,
+        coldkey_ss58=dave_wallet.coldkey.ss58_address,
+        hotkey_ss58=bob_wallet.hotkey.ss58_address,
         netuid=alice_subnet_netuid,
     )
 

tests/e2e_tests/test_stake_fee.py

@@ -19,7 +19,7 @@ async def test_stake_fee_api(local_chain, subtensor, alice_wallet, bob_wallet):
     netuid = 2
     root_netuid = 0
     stake_amount = Balance.from_tao(100)  # 100 TAO
-    min_stake_fee = Balance.from_rao(50_000)
+    min_stake_fee = Balance.from_tao(0.299076829)
 
     # Register subnet as Alice
     assert subtensor.register_subnet(alice_wallet), "Unable to register the subnet"
@@ -33,21 +33,19 @@ async def test_stake_fee_api(local_chain, subtensor, alice_wallet, bob_wallet):
         hotkey_ss58=alice_wallet.hotkey.ss58_address,
     )
     assert isinstance(stake_fee_0, Balance), "Stake fee should be a Balance object"
-    assert stake_fee_0 >= min_stake_fee, (
-        "Stake fee should be greater than the minimum stake fee"
+    assert stake_fee_0 == min_stake_fee, (
+        "Stake fee should be equal the minimum stake fee"
     )
 
     # Test unstake fee
-    stake_fee_1 = subtensor.get_unstake_fee(
+    unstake_fee_root = subtensor.get_unstake_fee(
         amount=stake_amount,
         netuid=root_netuid,
         coldkey_ss58=alice_wallet.coldkeypub.ss58_address,
         hotkey_ss58=bob_wallet.hotkey.ss58_address,
     )
-    assert isinstance(stake_fee_1, Balance), "Stake fee should be a Balance object"
-    assert stake_fee_1 >= min_stake_fee, (
-        "Stake fee should be greater than the minimum stake fee"
-    )
+    assert isinstance(unstake_fee_root, Balance), "Stake fee should be a Balance object"
+    assert unstake_fee_root == 0, "Root unstake fee should be 0."
 
     # Test various stake movement scenarios
     movement_scenarios = [
@@ -59,6 +57,7 @@ async def test_stake_fee_api(local_chain, subtensor, alice_wallet, bob_wallet):
             "dest_netuid": netuid,
             "dest_hotkey": alice_wallet.hotkey.ss58_address,
             "dest_coldkey": alice_wallet.coldkeypub.ss58_address,
+            "stake_fee": min_stake_fee,
         },
         # Move between hotkeys on root
         {
@@ -68,15 +67,27 @@ async def test_stake_fee_api(local_chain, subtensor, alice_wallet, bob_wallet):
             "dest_netuid": root_netuid,
             "dest_hotkey": bob_wallet.hotkey.ss58_address,
             "dest_coldkey": alice_wallet.coldkeypub.ss58_address,
+            "stake_fee": 0,
         },
-        # Move between coldkeys
+        # Move between coldkeys on root
         {
             "origin_netuid": root_netuid,
             "origin_hotkey": bob_wallet.hotkey.ss58_address,
             "origin_coldkey": alice_wallet.coldkeypub.ss58_address,
             "dest_netuid": root_netuid,
             "dest_hotkey": bob_wallet.hotkey.ss58_address,
             "dest_coldkey": bob_wallet.coldkeypub.ss58_address,
+            "stake_fee": 0,
+        },
+        # Move between coldkeys on non-root
+        {
+            "origin_netuid": netuid,
+            "origin_hotkey": bob_wallet.hotkey.ss58_address,
+            "origin_coldkey": alice_wallet.coldkeypub.ss58_address,
+            "dest_netuid": netuid,
+            "dest_hotkey": bob_wallet.hotkey.ss58_address,
+            "dest_coldkey": bob_wallet.coldkeypub.ss58_address,
+            "stake_fee": min_stake_fee,
         },
     ]
 
@@ -91,7 +102,7 @@ async def test_stake_fee_api(local_chain, subtensor, alice_wallet, bob_wallet):
             destination_coldkey_ss58=scenario["dest_coldkey"],
         )
         assert isinstance(stake_fee, Balance), "Stake fee should be a Balance object"
-        assert stake_fee >= min_stake_fee, (
+        assert stake_fee >= scenario["stake_fee"], (
             "Stake fee should be greater than the minimum stake fee"
         )