Chore: Backmerge 7.2

VERSION

@@ -1 +1 @@
-7.0.0
+7.2.0

bittensor/__init__.py

@@ -40,7 +40,7 @@
 
 
 # Bittensor code and protocol version.
-__version__ = "7.0.0"
+__version__ = "7.2.0"
 
 _version_split = __version__.split(".")
 __version_info__ = tuple(int(part) for part in _version_split)
@@ -304,7 +304,6 @@ def debug(on: bool = True):
     NeuronInfoLite,
     PrometheusInfo,
     DelegateInfo,
-    DelegateInfoLite,
     StakeInfo,
     SubnetInfo,
     SubnetHyperparameters,

bittensor/axon.py

@@ -896,7 +896,6 @@ async def default_verify(self, synapse: bittensor.Synapse):
             # If we don't have a nonce stored, ensure that the nonce falls within
             # a reasonable delta.
 
-            # Updated nonce using NTP implementated at v7.2
             if (
                 synapse.dendrite.version is not None
                 and synapse.dendrite.version >= V_7_2_0

bittensor/cli.py

@@ -29,7 +29,6 @@
     InspectCommand,
     ListCommand,
     ListDelegatesCommand,
-    ListDelegatesLiteCommand,
     MetagraphCommand,
     MyDelegatesCommand,
     NewColdkeyCommand,
@@ -133,7 +132,6 @@
             "undelegate": DelegateUnstakeCommand,
             "my_delegates": MyDelegatesCommand,
             "list_delegates": ListDelegatesCommand,
-            "list_delegates_lite": ListDelegatesLiteCommand,
             "nominate": NominateCommand,
         },
     },

bittensor/commands/__init__.py

@@ -74,7 +74,6 @@
 from .delegates import (
     NominateCommand,
     ListDelegatesCommand,
-    ListDelegatesLiteCommand,
     DelegateStakeCommand,
     DelegateUnstakeCommand,
     MyDelegatesCommand,

bittensor/commands/delegates.py

@@ -604,84 +604,9 @@ def check_config(config: "bittensor.config"):
                 config.unstake_all = True
 
 
-class ListDelegatesLiteCommand:
-    """
-    Displays a formatted table of Bittensor network delegates, providing a lite overview of delegate statistics and information. For a more detailed view, use the :func:`ListDelegatesCommand` class.
-
-    This table helps users make informed decisions on which delegates to allocate their TAO stake.
-
-    Optional Arguments:
-        - ``wallet.name``: The name of the wallet to use for the command.
-        - ``subtensor.network``: The name of the network to use for the command.
-
-    The table columns include:
-
-    - INDEX: The delegate's index in the sorted list.
-    - DELEGATE: The name of the delegate.
-    - SS58: The delegate's unique SS58 address (truncated for display).
-    - NOMINATORS: The count of nominators backing the delegate.
-    - VPERMIT: Indicates the subnets for which the delegate has validator permits.
-    - TAKE: The percentage of the delegate's earnings taken by the network.
-    - DELEGATE/(24h): The total earnings of the delegate in the last 24 hours.
-    - DESCRIPTION: A brief description of the delegate's purpose and operations.
-
-    Sorting is done based on the ``TOTAL STAKE`` column in descending order. Changes in stake are highlighted as follows: Increases are indicated in green and decreases are indicated in red. Entries with no previous data are marked with ``NA``. Each delegate's name is a hyperlink to their respective URL, if available.
-
-    Example usage::
-
-        btcli root list_delegates_lite
-        btcli root list_delegates_lite --wallet.name my_wallet
-        btcli root list_delegates_lite --subtensor.network finney # can also be `test` or `local`
-
-    Note:
-        This function is part of the Bittensor CLI tools and is intended for use within a console application. It prints directly to the console and does not return any value.
-    """
-
-    @staticmethod
-    def run(cli: "bittensor.cli"):
-        r"""
-        List all delegates on the network.
-        """
-        try:
-            cli.config.subtensor.network = "archive"
-            cli.config.subtensor.chain_endpoint = (
-                "wss://archive.chain.opentensor.ai:443"
-            )
-            subtensor: "bittensor.subtensor" = bittensor.subtensor(
-                config=cli.config, log_verbose=False
-            )
-            ListDelegatesLiteCommand._run(cli, subtensor)
-        finally:
-            if "subtensor" in locals():
-                subtensor.close()
-                bittensor.logging.debug("closing subtensor connection")
-
-    @staticmethod
-    def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
-        r"""
-        List all delegates on the network.
-        """
-        with bittensor.__console__.status(":satellite: Loading delegates..."):
-            delegates: list[bittensor.DelegateInfoLite] = subtensor.get_delegates_lite()
-
-        show_delegates_lite(delegates, width=cli.config.get("width", None))
-
-    @staticmethod
-    def add_args(parser: argparse.ArgumentParser):
-        list_delegates_parser = parser.add_parser(
-            "list_delegates_lite",
-            help="""List all delegates on the network (lite version).""",
-        )
-        bittensor.subtensor.add_args(list_delegates_parser)
-
-    @staticmethod
-    def check_config(config: "bittensor.config"):
-        pass
-
-
 class ListDelegatesCommand:
     """
-    Displays a formatted table of Bittensor network delegates, providing a comprehensive overview of delegate statistics and information. Use the :func:`ListDelegatesLiteCommand` class for a lighter version of this class.
+    Displays a formatted table of Bittensor network delegates, providing a comprehensive overview of delegate statistics and information.
 
     This table helps users make informed decisions on which delegates to allocate their TAO stake.
 

bittensor/commands/network.py

@@ -387,8 +387,13 @@ def _run(
         if (
             cli.config.param == "network_registration_allowed"
             or cli.config.param == "network_pow_registration_allowed"
+            or cli.config.param == "commit_reveal_weights_enabled"
         ):
-            cli.config.value = True if cli.config.value.lower() == "true" else False
+            cli.config.value = (
+                True
+                if (cli.config.value.lower() == "true" or cli.config.value == "1")
+                else False
+            )
 
         subtensor.set_hyperparameter(
             wallet,

bittensor/extrinsics/commit_weights.py

@@ -23,6 +23,7 @@
 from rich.prompt import Confirm
 
 import bittensor
+
 from bittensor.utils import format_error_message
 
 

bittensor/extrinsics/registration.py

@@ -23,6 +23,7 @@
 
 import bittensor
 from bittensor.utils import format_error_message
+
 from bittensor.utils.registration import (
     POWSolution,
     create_pow,

bittensor/extrinsics/root.py

@@ -61,13 +61,13 @@ def root_register_extrinsic(
     )
     if is_registered:
         bittensor.__console__.print(
-            f":white_heavy_check_mark: [green]Already registered on root network.[/green]"
+            ":white_heavy_check_mark: [green]Already registered on root network.[/green]"
         )
         return True
 
     if prompt:
         # Prompt user for confirmation.
-        if not Confirm.ask(f"Register to root network?"):
+        if not Confirm.ask("Register to root network?"):
             return False
 
     with bittensor.__console__.status(":satellite: Registering to root network..."):
@@ -130,6 +130,9 @@ def set_root_weights_extrinsic(
         success (bool):
             Flag is ``true`` if extrinsic was finalized or uncluded in the block. If we did not wait for finalization / inclusion, the response is ``true``.
     """
+
+    wallet.coldkey  # unlock coldkey
+
     # First convert types.
     if isinstance(netuids, list):
         netuids = np.array(netuids, dtype=np.int64)
@@ -177,7 +180,7 @@ def set_root_weights_extrinsic(
             weight_uids, weight_vals = weight_utils.convert_weights_and_uids_for_emit(
                 netuids, weights
             )
-            success, error_message = subtensor._do_set_weights(
+            success, error_message = subtensor._do_set_root_weights(
                 wallet=wallet,
                 netuid=0,
                 uids=weight_uids,

bittensor/subtensor.py

@@ -43,9 +43,9 @@
 from bittensor.btlogging import logging as _logger
 from bittensor.utils import torch, weight_utils, format_error_message
 from .chain_data import (
+    DelegateInfoLite,
     NeuronInfo,
     DelegateInfo,
-    DelegateInfoLite,
     PrometheusInfo,
     SubnetInfo,
     SubnetHyperparameters,
@@ -614,7 +614,6 @@ def set_take(
     ) -> bool:
         """
         Set delegate hotkey take
-
         Args:
             wallet (bittensor.wallet): The wallet containing the hotkey to be nominated.
             delegate_ss58 (str, optional): Hotkey
@@ -1082,6 +1081,7 @@ def reveal_weights(
         This function allows neurons to reveal their previously committed weight distribution, ensuring transparency
         and accountability within the Bittensor network.
         """
+
         retries = 0
         success = False
         message = "No attempt made. Perhaps it is too soon to reveal weights!"
@@ -2659,6 +2659,73 @@ def root_set_weights(
             prompt=prompt,
         )
 
+    def _do_set_root_weights(
+        self,
+        wallet: "bittensor.wallet",
+        uids: List[int],
+        vals: List[int],
+        netuid: int = 0,
+        version_key: int = bittensor.__version_as_int__,
+        wait_for_inclusion: bool = False,
+        wait_for_finalization: bool = False,
+    ) -> Tuple[bool, Optional[str]]:  # (success, error_message)
+        """
+        Internal method to send a transaction to the Bittensor blockchain, setting weights
+        for specified neurons on root. This method constructs and submits the transaction, handling
+        retries and blockchain communication.
+
+        Args:
+            wallet (bittensor.wallet): The wallet associated with the neuron setting the weights.
+            uids (List[int]): List of neuron UIDs for which weights are being set.
+            vals (List[int]): List of weight values corresponding to each UID.
+            netuid (int): Unique identifier for the network.
+            version_key (int, optional): Version key for compatibility with the network.
+            wait_for_inclusion (bool, optional): Waits for the transaction to be included in a block.
+            wait_for_finalization (bool, optional): Waits for the transaction to be finalized on the blockchain.
+
+        Returns:
+            Tuple[bool, Optional[str]]: A tuple containing a success flag and an optional error message.
+
+        This method is vital for the dynamic weighting mechanism in Bittensor, where neurons adjust their
+        trust in other neurons based on observed performance and contributions on the root network.
+        """
+
+        @retry(delay=2, tries=3, backoff=2, max_delay=4, logger=_logger)
+        def make_substrate_call_with_retry():
+            call = self.substrate.compose_call(
+                call_module="SubtensorModule",
+                call_function="set_root_weights",
+                call_params={
+                    "dests": uids,
+                    "weights": vals,
+                    "netuid": netuid,
+                    "version_key": version_key,
+                    "hotkey": wallet.hotkey.ss58_address,
+                },
+            )
+            # Period dictates how long the extrinsic will stay as part of waiting pool
+            extrinsic = self.substrate.create_signed_extrinsic(
+                call=call,
+                keypair=wallet.coldkey,
+                era={"period": 5},
+            )
+            response = self.substrate.submit_extrinsic(
+                extrinsic,
+                wait_for_inclusion=wait_for_inclusion,
+                wait_for_finalization=wait_for_finalization,
+            )
+            # We only wait here if we expect finalization.
+            if not wait_for_finalization and not wait_for_inclusion:
+                return True, "Not waiting for finalziation or inclusion."
+
+            response.process_events()
+            if response.is_success:
+                return True, "Successfully set weights."
+            else:
+                return False, response.error_message
+
+        return make_substrate_call_with_retry()
+
     ##################
     # Registry Calls #
     ##################
@@ -4325,8 +4392,6 @@ def get_delegates(self, block: Optional[int] = None) -> List[DelegateInfo]:
         Analyzing the delegate population offers insights into the network's governance dynamics and the distribution of
         trust and responsibility among participating neurons.
 
-        For a lighter version of this function, see :func:`get_delegates_lite`.
-
         Args:
             block (Optional[int], optional): The blockchain block number for the query.
 

bittensor/synapse.py

@@ -120,7 +120,7 @@ class TerminalInfo(BaseModel):
         ip (str): IP address of the terminal, crucial for network routing and data transmission.
         port (int): Network port used by the terminal, key for establishing network connections.
         version (int): Bittensor version running on the terminal, ensuring compatibility between different nodes in the network.
-        nonce (int): Unix timestamp that linearly increases for each request, ensuring requests cannot be duplicated or repeated
+        nonce (int): Unique, monotonically increasing number for each terminal, aiding in identifying and ordering network interactions.
         uuid (str): Unique identifier for the terminal, fundamental for network security and identification.
         hotkey (str): Encoded hotkey string of the terminal wallet, important for transaction and identity verification in the network.
         signature (str): Digital signature verifying the tuple of nonce, axon_hotkey, dendrite_hotkey, and uuid, critical for ensuring data authenticity and security.

bittensor/utils/weight_utils.py

@@ -20,6 +20,7 @@
 # DEALINGS IN THE SOFTWARE.
 
 import hashlib
+import logging
 from typing import Tuple, List, Union
 
 import numpy as np
@@ -140,11 +141,14 @@ def convert_root_weight_uids_and_vals_to_tensor(
     for uid_j, wij in list(zip(uids, weights)):
         if uid_j in subnets:
             index_s = subnets.index(uid_j)
+            row_weights[index_s] = float(
+                wij
+            )  # assumes max-upscaled values (w_max = U16_MAX).
         else:
-            raise Exception("Incorrect Subnet {uid_j} in {subnets}")
-        row_weights[index_s] = float(
-            wij
-        )  # assumes max-upscaled values (w_max = U16_MAX).
+            logging.warning(
+                f"Incorrect Subnet uid {uid_j} in Subnets {subnets}. The subnet is unavailable at the moment."
+            )
+            continue
     row_sum = row_weights.sum()
     if row_sum > 0:
         row_weights /= row_sum  # normalize
@@ -252,7 +256,7 @@ def process_weights_for_netuid(
         metagraph = subtensor.metagraph(netuid)
 
     # Cast weights to floats.
-    if not use_torch():
+    if use_torch():
         if not isinstance(weights, torch.FloatTensor):
             weights = weights.type(torch.float32)
     else:

tests/e2e_tests/subcommands/weights/test_commit_weights.py

@@ -14,6 +14,7 @@
 )
 from tests.e2e_tests.utils import setup_wallet
 
+
 """
 Test the Commit/Reveal weights mechanism. 
 
@@ -30,6 +31,7 @@
 def test_commit_and_reveal_weights(local_chain):
     # Register root as Alice
     keypair, exec_command, wallet_path = setup_wallet("//Alice", True)
+
     exec_command(RegisterSubnetworkCommand, ["s", "create"])
 
     # define values