Merge branch 'staging' into master

Author: thewhaleking

bittensor/core/async_subtensor.py

@@ -9,7 +9,7 @@
 import numpy as np
 import scalecodec
 from async_substrate_interface import AsyncSubstrateInterface
-from bittensor_commit_reveal import get_encrypted_commitment
+from bittensor_drand import get_encrypted_commitment
 from bittensor_wallet.utils import SS58_FORMAT
 from numpy.typing import NDArray
 from scalecodec import GenericCall
@@ -1480,9 +1480,9 @@ async def get_metagraph_info(
         Retrieves full or partial metagraph information for the specified subnet (netuid).
 
         Arguments:
-            netuid (int): The NetUID of the subnet to query.
-            field_indices (Optional[list[SelectiveMetagraphIndex]]): An optional list of SelectiveMetagraphIndex values
-                specifying which fields to retrieve. If not provided, all available fields will be returned.
+            netuid: The NetUID of the subnet to query.
+            field_indices: An optional list of SelectiveMetagraphIndex values specifying which fields to retrieve. If
+                not provided, all available fields will be returned.
             block: the block number at which to retrieve the hyperparameter. Do not specify if using block_hash or
                 reuse_block
             block_hash: The hash of blockchain block number for the query. Do not specify if using
@@ -1505,9 +1505,12 @@ async def get_metagraph_info(
 
         if field_indices:
             if isinstance(field_indices, list) and all(
-                isinstance(f, SelectiveMetagraphIndex) for f in field_indices
+                isinstance(f, (SelectiveMetagraphIndex, int)) for f in field_indices
             ):
-                indexes = [f.value for f in field_indices]
+                indexes = [
+                    f.value if isinstance(f, SelectiveMetagraphIndex) else f
+                    for f in field_indices
+                ]
             else:
                 raise ValueError(
                     "`field_indices` must be a list of SelectiveMetagraphIndex items."

bittensor/core/extrinsics/asyncex/commit_reveal.py

@@ -3,7 +3,7 @@
 from typing import Optional, Union, TYPE_CHECKING
 
 import numpy as np
-from bittensor_commit_reveal import get_encrypted_commit
+from bittensor_drand import get_encrypted_commit
 from numpy.typing import NDArray
 
 from bittensor.core.settings import version_as_int

bittensor/core/extrinsics/commit_reveal.py

@@ -2,7 +2,7 @@
 
 from typing import Union, TYPE_CHECKING, Optional
 
-from bittensor_commit_reveal import get_encrypted_commit
+from bittensor_drand import get_encrypted_commit
 import numpy as np
 from numpy.typing import NDArray
 

bittensor/core/subtensor.py

@@ -8,7 +8,7 @@
 from async_substrate_interface.errors import SubstrateRequestException
 from async_substrate_interface.sync_substrate import SubstrateInterface
 from async_substrate_interface.types import ScaleObj
-from bittensor_commit_reveal import get_encrypted_commitment
+from bittensor_drand import get_encrypted_commitment
 from numpy.typing import NDArray
 
 from bittensor.core.async_subtensor import ProposalVoteData
@@ -1133,18 +1133,18 @@ def get_minimum_required_stake(self) -> Balance:
     def get_metagraph_info(
         self,
         netuid: int,
-        field_indices: Optional[list["SelectiveMetagraphIndex"]] = None,
+        field_indices: Optional[list[Union["SelectiveMetagraphIndex", int]]] = None,
         block: Optional[int] = None,
     ) -> Optional[MetagraphInfo]:
         """
         Retrieves full or partial metagraph information for the specified subnet (netuid).
 
         Arguments:
-            netuid (int): The NetUID of the subnet to query.
-            field_indices (Optional[list[SelectiveMetagraphIndex]]): An optional list of SelectiveMetagraphIndex values
-                specifying which fields to retrieve. If not provided, all available fields will be returned.
-            block (Optional[int]):The block number at which to query the data. If not specified, the current block or
-                one determined via reuse_block or block_hash will be used.
+            netuid: The NetUID of the subnet to query.
+            field_indices: An optional list of SelectiveMetagraphIndex values specifying which fields to retrieve. If
+                not provided, all available fields will be returned.
+            block: The block number at which to query the data. If not specified, the current block or one determined
+                via reuse_block or block_hash will be used.
 
         Returns:
             Optional[MetagraphInfo]: A MetagraphInfo object containing the requested subnet data, or None if the subnet
@@ -1162,9 +1162,12 @@ def get_metagraph_info(
 
         if field_indices:
             if isinstance(field_indices, list) and all(
-                isinstance(f, SelectiveMetagraphIndex) for f in field_indices
+                isinstance(f, (SelectiveMetagraphIndex, int)) for f in field_indices
             ):
-                indexes = [f.value for f in field_indices]
+                indexes = [
+                    f.value if isinstance(f, SelectiveMetagraphIndex) else f
+                    for f in field_indices
+                ]
             else:
                 raise ValueError(
                     "`field_indices` must be a list of SelectiveMetagraphIndex items."

bittensor/core/timelock.py

@@ -57,7 +57,7 @@ class Person:
 import time
 from typing import Optional, Union
 
-from bittensor_commit_reveal import (
+from bittensor_drand import (
     encrypt as _btr_encrypt,
     decrypt as _btr_decrypt,
     get_latest_round,

bittensor/utils/easy_imports.py

@@ -47,6 +47,7 @@
     ProposalCallData,
     ProposalVoteData,
     ScheduledColdkeySwapInfo,
+    SelectiveMetagraphIndex,
     StakeInfo,
     SubnetHyperparameters,
     SubnetIdentity,

pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
     "pydantic>=2.3, <3",
     "scalecodec==1.2.11",
     "uvicorn",
-    "bittensor-commit-reveal>=0.4.0",
+    "bittensor-drand>=0.5.0",
     "bittensor-wallet>=3.0.8",
     "async-substrate-interface>=1.1.0"
 ]

scripts/check_requirements_changes.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Check if requirements files have changed in the last commit
-if git diff --name-only HEAD~1 | grep -E 'pyproject.toml'; then
+if git diff --name-only HEAD | grep -E 'pyproject.toml'; then
     echo "Requirements files may have changed. Running compatibility checks..."
     echo 'export REQUIREMENTS_CHANGED="true"' >> $BASH_ENV
 else

tests/unit_tests/test_async_subtensor.py

@@ -3100,7 +3100,7 @@ async def test_get_metagraph_info_specific_fields(subtensor, mocker):
     # Preps
     netuid = 1
     mock_value = {"mock": "data"}
-    fields = [SelectiveMetagraphIndex.Name, SelectiveMetagraphIndex.OwnerHotkey]
+    fields = [SelectiveMetagraphIndex.Name, 5]
 
     mock_runtime_call = mocker.patch.object(
         subtensor.substrate,
@@ -3119,7 +3119,13 @@ async def test_get_metagraph_info_specific_fields(subtensor, mocker):
     mock_runtime_call.assert_awaited_once_with(
         "SubnetInfoRuntimeApi",
         "get_selective_metagraph",
-        params=[netuid, [0] + [f.value for f in fields]],
+        params=[
+            netuid,
+            [0]
+            + [
+                f.value if isinstance(f, SelectiveMetagraphIndex) else f for f in fields
+            ],
+        ],
         block_hash=await subtensor.determine_block_hash(None),
     )
     mock_from_dict.assert_called_once_with(mock_value)
@@ -3131,8 +3137,8 @@ async def test_get_metagraph_info_specific_fields(subtensor, mocker):
         [
             "invalid",
         ],
-        [SelectiveMetagraphIndex.Active, 1],
-        [1, 2, 3],
+        [SelectiveMetagraphIndex.Active, 1, "f"],
+        [1, 2, 3, "f"],
     ],
 )
 @pytest.mark.asyncio

tests/unit_tests/test_subtensor.py

@@ -3428,7 +3428,7 @@ def test_get_metagraph_info_specific_fields(subtensor, mocker):
     # Preps
     netuid = 1
     mock_value = {"mock": "data"}
-    fields = [SelectiveMetagraphIndex.Name, SelectiveMetagraphIndex.OwnerHotkey]
+    fields = [SelectiveMetagraphIndex.Name, 5]
 
     mock_runtime_call = mocker.patch.object(
         subtensor.substrate,
@@ -3447,7 +3447,13 @@ def test_get_metagraph_info_specific_fields(subtensor, mocker):
     mock_runtime_call.assert_called_once_with(
         "SubnetInfoRuntimeApi",
         "get_selective_metagraph",
-        params=[netuid, [0] + [f.value for f in fields]],
+        params=[
+            netuid,
+            [0]
+            + [
+                f.value if isinstance(f, SelectiveMetagraphIndex) else f for f in fields
+            ],
+        ],
         block_hash=subtensor.determine_block_hash(None),
     )
     mock_from_dict.assert_called_once_with(mock_value)
@@ -3459,8 +3465,8 @@ def test_get_metagraph_info_specific_fields(subtensor, mocker):
         [
             "invalid",
         ],
-        [SelectiveMetagraphIndex.Active, 1],
-        [1, 2, 3],
+        [SelectiveMetagraphIndex.Active, 1, "f"],
+        [1, 2, 3, "f"],
     ],
 )
 def test_get_metagraph_info_invalid_field_indices(subtensor, wrong_fields):