Merge pull request #2146 from opentensor/feature/roman/migrate-delegate-info-to-onchain-indentities

`Migrate Delegate Info to onchain Indentities` implimentation.

Author: basfroman

bittensor/commands/delegates.py

@@ -46,7 +46,9 @@ def _get_coldkey_wallets_for_path(path: str) -> List["bittensor.wallet"]:
 
 
 def show_delegates_lite(
-    delegates_lite: List["bittensor.DelegateInfoLite"], width: Optional[int] = None
+    subtensor: "bittensor.subtensor",
+    delegates_lite: List["bittensor.DelegateInfoLite"],
+    width: Optional[int] = None,
 ):
     """
     This method is a lite version of the :func:`show_delegates`. This method displays a formatted table of Bittensor network delegates with detailed statistics to the console.
@@ -57,6 +59,7 @@ def show_delegates_lite(
     This helper function is not intended to be used directly in user code unless specifically required.
 
     Args:
+        subtensor (bittensor.subtensor): The instance of the subtensor class.
         delegates_lite (List[bittensor.DelegateInfoLite]): A list of delegate information objects to be displayed.
         width (Optional[int]): The width of the console output table. Defaults to ``None``, which will make the table expand to the maximum width of the console.
 
@@ -84,7 +87,7 @@ def show_delegates_lite(
     """
 
     registered_delegate_info: Optional[Dict[str, DelegatesDetails]] = (
-        get_delegates_details(url=bittensor.__delegates_details_url__)
+        get_delegates_details(subtensor=subtensor)
     )
     if registered_delegate_info is None:
         bittensor.__console__.print(
@@ -120,14 +123,17 @@ def show_delegates_lite(
     table.add_column("[overline white]Desc", style="rgb(50,163,219)")
 
     for i, d in enumerate(delegates_lite):
+        delegate_name = ""
+        delegate_url = ""
+        delegate_description = ""
         if d.delegate_ss58 in registered_delegate_info:
-            delegate_name = registered_delegate_info[d.delegate_ss58].name
-            delegate_url = registered_delegate_info[d.delegate_ss58].url
-            delegate_description = registered_delegate_info[d.delegate_ss58].description
-        else:
-            delegate_name = ""
-            delegate_url = ""
-            delegate_description = ""
+            delegate = registered_delegate_info[d.delegate_ss58]
+
+            delegate_name = delegate.display
+            delegate_url = delegate.web
+
+            if len(delegate.additional) > 0 and len(delegate.additional[0]) == 2:
+                delegate_description = delegate.additional[0][1]
 
         table.add_row(
             # `INDEX` column
@@ -153,6 +159,7 @@ def show_delegates_lite(
 
 # Uses rich console to pretty print a table of delegates.
 def show_delegates(
+    subtensor: "bittensor.subtensor",
     delegates: List["bittensor.DelegateInfo"],
     prev_delegates: Optional[List["bittensor.DelegateInfo"]],
     width: Optional[int] = None,
@@ -167,6 +174,7 @@ def show_delegates(
     to be used directly in user code unless specifically required.
 
     Args:
+        subtensor (bittensor.subtensor): The instance of the subtensor class.
         delegates (List[bittensor.DelegateInfo]): A list of delegate information objects to be displayed.
         prev_delegates (Optional[List[bittensor.DelegateInfo]]): A list of delegate information objects from a previous state, used to calculate changes in stake. Defaults to ``None``.
         width (Optional[int]): The width of the console output table. Defaults to ``None``, which will make the table expand to the maximum width of the console.
@@ -207,7 +215,7 @@ def show_delegates(
             prev_delegates_dict[prev_delegate.hotkey_ss58] = prev_delegate
 
     registered_delegate_info: Optional[Dict[str, DelegatesDetails]] = (
-        get_delegates_details(url=bittensor.__delegates_details_url__)
+        get_delegates_details(subtensor=subtensor)
     )
     if registered_delegate_info is None:
         bittensor.__console__.print(
@@ -265,16 +273,17 @@ def show_delegates(
             ),
             bittensor.Balance.from_rao(0),  # default to 0 if no owner stake.
         )
+
+        delegate_name = ""
+        delegate_url = ""
+        delegate_description = ""
+
         if delegate.hotkey_ss58 in registered_delegate_info:
-            delegate_name = registered_delegate_info[delegate.hotkey_ss58].name
-            delegate_url = registered_delegate_info[delegate.hotkey_ss58].url
-            delegate_description = registered_delegate_info[
-                delegate.hotkey_ss58
-            ].description
-        else:
-            delegate_name = ""
-            delegate_url = ""
-            delegate_description = ""
+            delegate_ = registered_delegate_info[delegate.hotkey_ss58]
+            delegate_name = delegate_.display
+            delegate_url = delegate_.web
+            if len(delegate_.additional) > 0 and len(delegate_.additional[1]) == 2:
+                delegate_description = delegate_.additional[0][1]
 
         if delegate.hotkey_ss58 in prev_delegates_dict:
             prev_stake = prev_delegates_dict[delegate.hotkey_ss58].total_stake
@@ -431,7 +440,9 @@ def check_config(config: "bittensor.config"):
                 sys.exit(1)
 
             delegates.sort(key=lambda delegate: delegate.total_stake, reverse=True)
-            show_delegates(delegates, prev_delegates=prev_delegates)
+            show_delegates(
+                subtensor=subtensor, delegates=delegates, prev_delegates=prev_delegates
+            )
             delegate_index = Prompt.ask("Enter delegate index")
             config.delegate_ss58key = str(delegates[int(delegate_index)].hotkey_ss58)
             console.print(
@@ -576,7 +587,9 @@ def check_config(config: "bittensor.config"):
                 sys.exit(1)
 
             delegates.sort(key=lambda delegate: delegate.total_stake, reverse=True)
-            show_delegates(delegates, prev_delegates=prev_delegates)
+            show_delegates(
+                subtensor=subtensor, delegates=delegates, prev_delegates=prev_delegates
+            )
             delegate_index = Prompt.ask("Enter delegate index")
             config.delegate_ss58key = str(delegates[int(delegate_index)].hotkey_ss58)
             console.print(
@@ -682,7 +695,8 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
             )
 
         show_delegates(
-            delegates,
+            subtensor=subtensor,
+            delegates=delegates,
             prev_delegates=prev_delegates,
             width=cli.config.get("width", None),
         )
@@ -955,7 +969,7 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
             total_delegated += sum(my_delegates.values())
 
             registered_delegate_info: Optional[DelegatesDetails] = (
-                get_delegates_details(url=bittensor.__delegates_details_url__)
+                get_delegates_details(subtensor=subtensor)
             )
             if registered_delegate_info is None:
                 bittensor.__console__.print(

bittensor/commands/inspect.py

@@ -139,7 +139,7 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
         bittensor.logging.debug(f"Netuids to check: {netuids}")
 
         registered_delegate_info: Optional[Dict[str, DelegatesDetails]] = (
-            get_delegates_details(url=bittensor.__delegates_details_url__)
+            get_delegates_details(subtensor=subtensor)
         )
         if registered_delegate_info is None:
             bittensor.__console__.print(
@@ -190,7 +190,7 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
             table.add_row(wallet.name, str(cold_balance), "", "", "", "", "", "", "")
             for dele, staked in delegates:
                 if dele.hotkey_ss58 in registered_delegate_info:
-                    delegate_name = registered_delegate_info[dele.hotkey_ss58].name
+                    delegate_name = registered_delegate_info[dele.hotkey_ss58].display
                 else:
                     delegate_name = dele.hotkey_ss58
                 table.add_row(
@@ -249,7 +249,7 @@ def check_config(config: "bittensor.config"):
             wallet_name = Prompt.ask("Enter wallet name", default=defaults.wallet.name)
             config.wallet.name = str(wallet_name)
 
-        if config.netuids != [] and config.netuids != None:
+        if config.netuids != [] and config.netuids is not None:
             if not isinstance(config.netuids, list):
                 config.netuids = [int(config.netuids)]
             else:

bittensor/commands/network.py

@@ -248,7 +248,7 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
         rows = []
         total_neurons = 0
         delegate_info: Optional[Dict[str, DelegatesDetails]] = get_delegates_details(
-            url=bittensor.__delegates_details_url__
+            subtensor=subtensor
         )
 
         for subnet in subnets:
@@ -262,7 +262,7 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
                     str(subnet.tempo),
                     f"{subnet.burn!s:8.8}",
                     str(bittensor.utils.formatting.millify(subnet.difficulty)),
-                    f"{delegate_info[subnet.owner_ss58].name if subnet.owner_ss58 in delegate_info else subnet.owner_ss58}",
+                    f"{delegate_info[subnet.owner_ss58].display if subnet.owner_ss58 in delegate_info else subnet.owner_ss58}",
                 )
             )
         table = Table(

bittensor/commands/root.py

@@ -149,7 +149,7 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
             netuid=0
         )
         delegate_info: Optional[Dict[str, DelegatesDetails]] = get_delegates_details(
-            url=bittensor.__delegates_details_url__
+            subtensor=subtensor
         )
 
         table = Table(show_footer=False)
@@ -191,7 +191,7 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
             table.add_row(
                 str(neuron_data.uid),
                 (
-                    delegate_info[neuron_data.hotkey].name
+                    delegate_info[neuron_data.hotkey].display
                     if neuron_data.hotkey in delegate_info
                     else ""
                 ),

bittensor/commands/senate.py

@@ -71,7 +71,7 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
 
         senate_members = subtensor.get_senate_members()
         delegate_info: Optional[Dict[str, DelegatesDetails]] = get_delegates_details(
-            url=bittensor.__delegates_details_url__
+            subtensor=subtensor
         )
 
         table = Table(show_footer=False)
@@ -93,7 +93,7 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
         for ss58_address in senate_members:
             table.add_row(
                 (
-                    delegate_info[ss58_address].name
+                    delegate_info[ss58_address].display
                     if ss58_address in delegate_info
                     else ""
                 ),
@@ -143,22 +143,23 @@ def format_call_data(call_data: "bittensor.ProposalCallData") -> str:
 
 
 def display_votes(
-    vote_data: "bittensor.ProposalVoteData", delegate_info: "bittensor.DelegateInfo"
+    vote_data: "bittensor.ProposalVoteData",
+    delegate_info: "Dict[str, DelegatesDetails]",
 ) -> str:
     vote_list = list()
 
     for address in vote_data["ayes"]:
         vote_list.append(
             "{}: {}".format(
-                delegate_info[address].name if address in delegate_info else address,
+                delegate_info[address].display if address in delegate_info else address,
                 "[bold green]Aye[/bold green]",
             )
         )
 
     for address in vote_data["nays"]:
         vote_list.append(
             "{}: {}".format(
-                delegate_info[address].name if address in delegate_info else address,
+                delegate_info[address].display if address in delegate_info else address,
                 "[bold red]Nay[/bold red]",
             )
         )
@@ -212,7 +213,7 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
         proposals = subtensor.get_proposals()
 
         registered_delegate_info: Optional[Dict[str, DelegatesDetails]] = (
-            get_delegates_details(url=bittensor.__delegates_details_url__)
+            get_delegates_details(subtensor=subtensor)
         )
 
         table = Table(show_footer=False)
@@ -338,12 +339,12 @@ def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
             return
 
         proposal_vote_data = subtensor.get_vote_data(proposal_hash)
-        if proposal_vote_data == None:
+        if proposal_vote_data is None:
             console.print(":cross_mark: [red]Failed[/red]: Proposal not found.")
             return
 
         registered_delegate_info: Optional[Dict[str, DelegatesDetails]] = (
-            get_delegates_details(url=bittensor.__delegates_details_url__)
+            get_delegates_details(subtensor=subtensor)
         )
 
         table = Table(show_footer=False)

bittensor/commands/stake.py

@@ -425,13 +425,13 @@ def run(cli: "bittensor.cli"):
 
     @staticmethod
     def _run(cli: "bittensor.cli", subtensor: "bittensor.subtensor"):
-        r"""Show all stake accounts."""
-        if cli.config.get("all", d=False) == True:
+        """Show all stake accounts."""
+        if cli.config.get("all", d=False) is True:
             wallets = _get_coldkey_wallets_for_path(cli.config.wallet.path)
         else:
             wallets = [bittensor.wallet(config=cli.config)]
         registered_delegate_info: Optional[Dict[str, DelegatesDetails]] = (
-            get_delegates_details(url=bittensor.__delegates_details_url__)
+            get_delegates_details(subtensor=subtensor)
         )
 
         def get_stake_accounts(
@@ -515,7 +515,7 @@ def get_stakes_from_delegates(
                 for nom in dele.nominators:
                     if nom[0] == wallet.coldkeypub.ss58_address:
                         delegate_name = (
-                            registered_delegate_info[dele.hotkey_ss58].name
+                            registered_delegate_info[dele.hotkey_ss58].display
                             if dele.hotkey_ss58 in registered_delegate_info
                             else dele.hotkey_ss58
                         )