Merge branch 'staging' into feat/roman/add-get-owned-hotkeys

Author: basfroman

.github/workflows/e2e-subtensor-tests.yaml

@@ -80,6 +80,11 @@ jobs:
       - name: Check-out repository
         uses: actions/checkout@v4
 
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
       - name: Install uv
         uses: astral-sh/setup-uv@v4
 

tests/e2e_tests/conftest.py

@@ -164,7 +164,7 @@ def try_start_docker():
         print("Docker wasn't run. Manual start may be required.")
         return False
 
-    container_name = f"test_local_chain_{str(time.time()).replace(".", "_")}"
+    container_name = f"test_local_chain_{str(time.time()).replace('.', '_')}"
 
     # Command to start container
     cmds = [

tests/e2e_tests/test_commit_weights.py

@@ -7,6 +7,7 @@
 from tests.e2e_tests.utils.chain_interactions import (
     sudo_set_admin_utils,
     sudo_set_hyperparameter_bool,
+    use_and_wait_for_next_nonce,
     wait_epoch,
 )
 
@@ -227,42 +228,44 @@ async def test_commit_weights_uses_next_nonce(local_chain, subtensor, alice_wall
     salt3[0] += 2  # Increment the first byte to produce a different commit hash
 
     # Commit all three salts
-    success, message = subtensor.commit_weights(
-        alice_wallet,
-        netuid,
-        salt=salt,
-        uids=weight_uids,
-        weights=weight_vals,
-        wait_for_inclusion=False,  # Don't wait for inclusion, we are testing the nonce when there is a tx in the pool
-        wait_for_finalization=False,
-    )
-
-    assert success is True
-
-    success, message = subtensor.commit_weights(
-        alice_wallet,
-        netuid,
-        salt=salt2,
-        uids=weight_uids,
-        weights=weight_vals,
-        wait_for_inclusion=False,
-        wait_for_finalization=False,
-    )
-
-    assert success is True
-
-    # Commit the third salt
-    success, message = subtensor.commit_weights(
-        alice_wallet,
-        netuid,
-        salt=salt3,
-        uids=weight_uids,
-        weights=weight_vals,
-        wait_for_inclusion=False,
-        wait_for_finalization=False,
-    )
-
-    assert success is True
+    async with use_and_wait_for_next_nonce(subtensor, alice_wallet):
+        success, message = subtensor.commit_weights(
+            alice_wallet,
+            netuid,
+            salt=salt,
+            uids=weight_uids,
+            weights=weight_vals,
+            wait_for_inclusion=False,  # Don't wait for inclusion, we are testing the nonce when there is a tx in the pool
+            wait_for_finalization=False,
+        )
+
+        assert success is True
+
+    async with use_and_wait_for_next_nonce(subtensor, alice_wallet):
+        success, message = subtensor.commit_weights(
+            alice_wallet,
+            netuid,
+            salt=salt2,
+            uids=weight_uids,
+            weights=weight_vals,
+            wait_for_inclusion=False,
+            wait_for_finalization=False,
+        )
+
+        assert success is True
+
+    async with use_and_wait_for_next_nonce(subtensor, alice_wallet):
+        success, message = subtensor.commit_weights(
+            alice_wallet,
+            netuid,
+            salt=salt3,
+            uids=weight_uids,
+            weights=weight_vals,
+            wait_for_inclusion=False,
+            wait_for_finalization=False,
+        )
+
+        assert success is True
 
     # Wait a few blocks
     await asyncio.sleep(10)  # Wait for the txs to be included in the chain

tests/e2e_tests/test_incentive.py

@@ -84,8 +84,7 @@ async def test_incentive(local_chain, subtensor, templates, alice_wallet, bob_wa
     async with templates.miner(bob_wallet, netuid):
         async with templates.validator(alice_wallet, netuid) as validator:
             # wait for the Validator to process and set_weights
-            async with asyncio.timeout(60):
-                await validator.set_weights.wait()
+            await asyncio.wait_for(validator.set_weights.wait(), 60)
 
             # Wait till new epoch
             await wait_interval(tempo, subtensor, netuid)

tests/e2e_tests/test_set_weights.py

@@ -6,6 +6,7 @@
 from tests.e2e_tests.utils.chain_interactions import (
     sudo_set_hyperparameter_bool,
     sudo_set_admin_utils,
+    use_and_wait_for_next_nonce,
     wait_epoch,
 )
 
@@ -108,16 +109,17 @@ async def test_set_weights_uses_next_nonce(local_chain, subtensor, alice_wallet)
 
     # Set weights for each subnet
     for netuid in netuids:
-        success, message = subtensor.set_weights(
-            alice_wallet,
-            netuid,
-            uids=weight_uids,
-            weights=weight_vals,
-            wait_for_inclusion=False,  # Don't wait for inclusion, we are testing the nonce when there is a tx in the pool
-            wait_for_finalization=False,
-        )
-
-        assert success is True, f"Failed to set weights for subnet {netuid}"
+        async with use_and_wait_for_next_nonce(subtensor, alice_wallet):
+            success, message = subtensor.set_weights(
+                alice_wallet,
+                netuid,
+                uids=weight_uids,
+                weights=weight_vals,
+                wait_for_inclusion=False,  # Don't wait for inclusion, we are testing the nonce when there is a tx in the pool
+                wait_for_finalization=False,
+            )
+
+            assert success is True, message
 
     # Wait for the txs to be included in the chain
     await wait_epoch(subtensor, netuid=netuids[-1], times=4)

tests/e2e_tests/utils/chain_interactions.py

@@ -4,6 +4,7 @@
 """
 
 import asyncio
+import contextlib
 import unittest.mock
 from typing import Union, Optional, TYPE_CHECKING
 
@@ -150,6 +151,30 @@ async def wait_interval(
             )
 
 
+@contextlib.asynccontextmanager
+async def use_and_wait_for_next_nonce(
+    subtensor: "Subtensor",
+    wallet: "Wallet",
+    sleep: float = 0.25,
+    timeout: float = 15.0,
+):
+    """
+    ContextManager that makes sure the Nonce has been consumed after sending Extrinsic.
+    """
+
+    nonce = subtensor.substrate.get_account_next_index(wallet.hotkey.ss58_address)
+
+    yield
+
+    async def wait_for_new_nonce():
+        while nonce == subtensor.substrate.get_account_next_index(
+            wallet.hotkey.ss58_address
+        ):
+            await asyncio.sleep(sleep)
+
+    await asyncio.wait_for(wait_for_new_nonce(), timeout)
+
+
 # Helper to execute sudo wrapped calls on the chain
 def sudo_set_admin_utils(
     substrate: "SubstrateInterface",

tests/e2e_tests/utils/e2e_test_utils.py

@@ -116,8 +116,7 @@ async def __aenter__(self):
 
             self.__reader_task = asyncio.create_task(self._reader())
 
-            async with asyncio.timeout(30):
-                await self.started.wait()
+            await asyncio.wait_for(self.started.wait(), 30)
 
             return self
 
@@ -166,8 +165,7 @@ async def __aenter__(self):
 
             self.__reader_task = asyncio.create_task(self._reader())
 
-            async with asyncio.timeout(30):
-                await self.started.wait()
+            await asyncio.wait_for(self.started.wait(), 30)
 
             return self