From 34328adf5045ef860b431e2b5f160d00bbe804e8 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Thu, 2 Apr 2026 20:24:01 +0200
Subject: [PATCH 01/30] Compatibility init

---
 bittensor_cli/src/bittensor/chain_data.py     | 46 ++++---------------
 .../src/bittensor/subtensor_interface.py      |  3 +-
 bittensor_cli/src/bittensor/utils.py          | 10 ++--
 pyproject.toml                                |  2 +-
 4 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/bittensor_cli/src/bittensor/chain_data.py b/bittensor_cli/src/bittensor/chain_data.py
index 0e8f27c43..e172549fd 100644
--- a/bittensor_cli/src/bittensor/chain_data.py
+++ b/bittensor_cli/src/bittensor/chain_data.py
@@ -70,32 +70,6 @@ def _tbwu(val: int, netuid: Optional[int] = 0) -> Balance:
     return Balance.from_rao(val).set_unit(netuid)
 
 
-def _chr_str(codes: tuple[int]) -> str:
-    """Converts a tuple of integer Unicode code points into a string."""
-    return "".join(map(chr, codes))
-
-
-def process_nested(
-    data: Sequence[dict[Hashable, tuple[int]]] | dict | Any,
-    chr_transform: Callable[[tuple[int]], str],
-) -> list[dict[Hashable, str]] | dict[Hashable, str] | Any:
-    """Processes nested data structures by applying a transformation function to their elements."""
-    if isinstance(data, Sequence):
-        if len(data) > 0 and isinstance(data[0], dict):
-            return [
-                {k: chr_transform(v) for k, v in item.items()}
-                if item is not None
-                else None
-                for item in data
-            ]
-        # TODO @abe why do we kind of silently fail here?
-        return {}
-    elif isinstance(data, dict):
-        return {k: chr_transform(v) for k, v in data.items()}
-    else:
-        return data
-
-
 @dataclass
 class AxonInfo:
     version: int
@@ -695,14 +669,14 @@ class SubnetIdentity(InfoBase):
     @classmethod
     def _fix_decoded(cls, decoded: dict) -> "SubnetIdentity":
         return cls(
-            subnet_name=bytes(decoded["subnet_name"]).decode(),
-            github_repo=bytes(decoded["github_repo"]).decode(),
-            subnet_contact=bytes(decoded["subnet_contact"]).decode(),
-            subnet_url=bytes(decoded["subnet_url"]).decode(),
-            discord=bytes(decoded["discord"]).decode(),
-            description=bytes(decoded["description"]).decode(),
-            logo_url=bytes(decoded["logo_url"]).decode(),
-            additional=bytes(decoded["additional"]).decode(),
+            subnet_name=decoded["subnet_name"],
+            github_repo=decoded["github_repo"],
+            subnet_contact=decoded["subnet_contact"],
+            subnet_url=decoded["subnet_url"],
+            discord=decoded["discord"],
+            description=decoded["description"],
+            logo_url=decoded["logo_url"],
+            additional=decoded["additional"],
         )
 
 
@@ -1122,10 +1096,6 @@ def _fix_decoded(cls, decoded: dict) -> "MetagraphInfo":
         # Name and symbol
         decoded.update({"name": bytes(decoded.get("name")).decode()})
         decoded.update({"symbol": bytes(decoded.get("symbol")).decode()})
-        for key in ["identities", "identity"]:
-            raw_data = decoded.get(key)
-            processed = process_nested(raw_data, _chr_str)
-            decoded.update({key: processed})
 
         return cls(
             # Subnet index
diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index 6cb3f592a..9b4fe11e5 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -2221,8 +2221,7 @@ async def get_all_coldkeys_claim_type(
         root_claim_types = {}
         for coldkey, claim_type_data in result.records:
             coldkey_ss58 = decode_account_id(coldkey[0])
-
-            claim_type_key = next(iter(claim_type_data.value.keys()))
+            claim_type_key = claim_type_data.value
 
             if claim_type_key == "KeepSubnets":
                 subnets_data = claim_type_data.value["KeepSubnets"]["subnets"]
diff --git a/bittensor_cli/src/bittensor/utils.py b/bittensor_cli/src/bittensor/utils.py
index fe6c7c6b9..4657ee4c5 100644
--- a/bittensor_cli/src/bittensor/utils.py
+++ b/bittensor_cli/src/bittensor/utils.py
@@ -633,11 +633,11 @@ def is_valid_bittensor_address_or_public_key(address: Union[str, bytes]) -> bool
         return False
 
 
-def decode_account_id(account_id_bytes: Union[tuple[int], tuple[tuple[int]]]):
-    if isinstance(account_id_bytes, tuple) and isinstance(account_id_bytes[0], tuple):
-        account_id_bytes = account_id_bytes[0]
-    # Convert the AccountId bytes to a Base64 string
-    return ss58_encode(bytes(account_id_bytes).hex(), SS58_FORMAT)
+def decode_account_id(account_id_bytes: str) -> str:
+    """
+    Does nothing. Retained for compatibility til v10
+    """
+    return account_id_bytes
 
 
 def encode_account_id(ss58_address: str) -> bytes:
diff --git a/pyproject.toml b/pyproject.toml
index cf15c659d..786fdbb29 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,7 +40,7 @@ dependencies = [
     "pycryptodome>=3.0.0,<4.0.0",
     "PyYAML~=6.0",
     "rich>=13.7,<15.0",
-    "scalecodec==1.2.12",
+    "cyscale==0.1.5",
     "typer>=0.16",
     "typing_extensions>4.0.0; python_version<'3.11'",
     "bittensor-wallet==4.0.1",

From a34def9cf7e2be67ff2960accd631c85c59101d3 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Thu, 2 Apr 2026 20:57:34 +0200
Subject: [PATCH 02/30] More stripping

---
 bittensor_cli/src/bittensor/chain_data.py      | 18 ------------------
 .../src/bittensor/subtensor_interface.py       | 12 +++++-------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/bittensor_cli/src/bittensor/chain_data.py b/bittensor_cli/src/bittensor/chain_data.py
index e172549fd..df81dc633 100644
--- a/bittensor_cli/src/bittensor/chain_data.py
+++ b/bittensor_cli/src/bittensor/chain_data.py
@@ -37,24 +37,6 @@ class ChainDataType(Enum):
     SubnetIdentity = 11
 
 
-def decode_hex_identity(info_dictionary):
-    decoded_info = {}
-    for k, v in info_dictionary.items():
-        if isinstance(v, dict):
-            item = next(iter(v.values()))
-        else:
-            item = v
-
-        if isinstance(item, tuple):
-            try:
-                decoded_info[k] = bytes(item).decode()
-            except UnicodeDecodeError:
-                print(f"Could not decode: {k}: {item}")
-        else:
-            decoded_info[k] = item
-    return decoded_info
-
-
 def process_stake_data(stake_data, netuid):
     decoded_stake_data = {}
     for account_id_bytes, stake_ in stake_data:
diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index 9b4fe11e5..4ab14f304 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -24,7 +24,6 @@
     NeuronInfo,
     SubnetHyperparameters,
     decode_account_id,
-    decode_hex_identity,
     DynamicInfo,
     SubnetState,
     MetagraphInfo,
@@ -953,11 +952,10 @@ async def query_all_identities(
             reuse_block_hash=reuse_block,
             fully_exhaust=True,
         )
-        all_identities = {}
-        for ss58_address, identity in identities.records:
-            all_identities[decode_account_id(ss58_address[0])] = decode_hex_identity(
-                identity.value
-            )
+        all_identities = {
+            ss58_address: identity.value
+            for (ss58_address, identity) in identities.records
+        }
 
         return all_identities
 
@@ -995,7 +993,7 @@ async def query_identity(
         if not identity_info:
             return {}
         try:
-            return decode_hex_identity(identity_info)
+            return identity_info
         except TypeError:
             return {}
 

From f5ed67bba2135e6fd4bd237f213ed545b874473e Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Thu, 2 Apr 2026 21:02:14 +0200
Subject: [PATCH 03/30] More stripping

---
 bittensor_cli/src/bittensor/subtensor_interface.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index 4ab14f304..75cc7540d 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -1653,8 +1653,7 @@ async def get_stake_for_coldkeys(
         for result in results:
             if result is None:
                 continue
-            for coldkey_bytes, stake_info_list in result:
-                coldkey_ss58 = decode_account_id(coldkey_bytes)
+            for coldkey_ss58, stake_info_list in result:
                 stake_info_map[coldkey_ss58] = StakeInfo.list_from_any(stake_info_list)
 
         return stake_info_map if stake_info_map else None
@@ -1719,8 +1718,7 @@ async def get_owned_hotkeys(
             block_hash=block_hash,
             reuse_block_hash=reuse_block,
         )
-
-        return [decode_account_id(hotkey[0]) for hotkey in owned_hotkeys or []]
+        return owned_hotkeys
 
     async def get_extrinsic_fee(
         self, call: GenericCall, keypair: Keypair, proxy: Optional[str] = None

From 15448affeace8a2ce4bf5bd6423032a5631e6396 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Tue, 7 Apr 2026 17:02:11 +0200
Subject: [PATCH 04/30] No longer needed to extract bytes to hex

---
 bittensor_cli/src/bittensor/chain_data.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bittensor_cli/src/bittensor/chain_data.py b/bittensor_cli/src/bittensor/chain_data.py
index df81dc633..fbb4b7b83 100644
--- a/bittensor_cli/src/bittensor/chain_data.py
+++ b/bittensor_cli/src/bittensor/chain_data.py
@@ -875,11 +875,10 @@ def _fix_decoded(
         cls, coldkey: str, decoded: tuple
     ) -> "ColdkeySwapAnnouncementInfo":
         execution_block, new_coldkey_hash = decoded
-        hash_str = "0x" + bytes(new_coldkey_hash[0]).hex()
         return cls(
             coldkey=coldkey,
             execution_block=int(execution_block),
-            new_coldkey_hash=hash_str,
+            new_coldkey_hash=new_coldkey_hash,
         )
 
 

From a5e62a5d7b0a27edad8b589f791ca78d0f34578d Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Tue, 7 Apr 2026 17:19:46 +0200
Subject: [PATCH 05/30] No longer needed to decode account id

---
 bittensor_cli/src/bittensor/subtensor_interface.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index 75cc7540d..b015b0698 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -2056,9 +2056,8 @@ async def get_crowdloan_contributors(
         )
 
         contributor_contributions = {}
-        for contributor_key, contribution_amount in contributors_data.records:
+        for contributor_address, contribution_amount in contributors_data.records:
             try:
-                contributor_address = decode_account_id(contributor_key[0])
                 contribution_balance = Balance.from_rao(contribution_amount.value)
                 contributor_contributions[contributor_address] = contribution_balance
             except Exception:

From 7fc6afce543ae70b65a09502c208cbf3e01719f1 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Tue, 7 Apr 2026 17:29:45 +0200
Subject: [PATCH 06/30] No need to decode from bytes

---
 bittensor_cli/src/bittensor/subtensor_interface.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index b015b0698..be72aa1dd 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -180,10 +180,9 @@ async def _decode_inline_call(
         """
         if not call_option or "Inline" not in call_option:
             return None
-        inline_bytes = bytes(call_option["Inline"][0][0])
         call_obj = await self.substrate.create_scale_object(
             "Call",
-            data=ScaleBytes(inline_bytes),
+            data=ScaleBytes(call_option["Inline"]),
             block_hash=block_hash,
         )
         call_value = call_obj.decode()

From b71067e0f6aedbf2e8493a03dd93929d81abb58b Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Tue, 7 Apr 2026 19:55:59 +0200
Subject: [PATCH 07/30] Decoding

---
 .../src/bittensor/subtensor_interface.py      | 23 ++++++-------------
 .../src/commands/stake/children_hotkeys.py    |  7 +++---
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index be72aa1dd..dc988d0c8 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -63,17 +63,10 @@ class ProposalVoteData:
     def __init__(self, proposal_dict: dict) -> None:
         self.index = proposal_dict["index"]
         self.threshold = proposal_dict["threshold"]
-        self.ayes = self.decode_ss58_tuples(proposal_dict["ayes"])
-        self.nays = self.decode_ss58_tuples(proposal_dict["nays"])
+        self.ayes = proposal_dict["ayes"]
+        self.nays = proposal_dict["nays"]
         self.end = proposal_dict["end"]
 
-    @staticmethod
-    def decode_ss58_tuples(data: tuple):
-        """
-        Decodes a tuple of ss58 addresses formatted as bytes tuples
-        """
-        return [decode_account_id(data[x][0]) for x in range(len(data))]
-
 
 class SubtensorInterface:
     """
@@ -165,10 +158,7 @@ async def query(
             subscription_handler,
             reuse_block_hash,
         )
-        if hasattr(result, "value"):
-            return result.value
-        else:
-            return result
+        return getattr(result, "value", result)
 
     async def _decode_inline_call(
         self,
@@ -180,10 +170,12 @@ async def _decode_inline_call(
         """
         if not call_option or "Inline" not in call_option:
             return None
+        runtime = await self.substrate.init_runtime(block_hash=block_hash)
         call_obj = await self.substrate.create_scale_object(
             "Call",
             data=ScaleBytes(call_option["Inline"]),
             block_hash=block_hash,
+            runtime=runtime
         )
         call_value = call_obj.decode()
 
@@ -1387,9 +1379,8 @@ async def get_children(self, hotkey, netuid) -> tuple[bool, list, str]:
                 formatted_children = []
                 for proportion, child in children:
                     # Convert U64 to int
-                    formatted_child = decode_account_id(child[0])
                     int_proportion = int(proportion)
-                    formatted_children.append((int_proportion, formatted_child))
+                    formatted_children.append((int_proportion, child))
                 return True, formatted_children, ""
             else:
                 return True, [], ""
@@ -2660,7 +2651,7 @@ async def get_mev_shield_next_key(
             storage_function="NextKey",
             block_hash=block_hash,
         )
-        public_key_bytes = bytes(next(iter(result)))
+        public_key_bytes = bytes.fromhex(result.removeprefix("0x"))
 
         if len(public_key_bytes) != MEV_SHIELD_PUBLIC_KEY_SIZE:
             raise ValueError(
diff --git a/bittensor_cli/src/commands/stake/children_hotkeys.py b/bittensor_cli/src/commands/stake/children_hotkeys.py
index 69d4083e4..d4bfbfa10 100644
--- a/bittensor_cli/src/commands/stake/children_hotkeys.py
+++ b/bittensor_cli/src/commands/stake/children_hotkeys.py
@@ -477,11 +477,11 @@ async def _render_table(
 
         console.print(table)
 
+    netuid_children_tuples = []
     # Core logic for get_children
     if netuid is None:
         # get all netuids
         netuids = await subtensor.get_all_subnet_netuids()
-        netuid_children_tuples = []
         for netuid_ in netuids:
             success, children, err_mg = await subtensor.get_children(
                 get_hotkey_pub_ss58(wallet), netuid_
@@ -493,6 +493,7 @@ async def _render_table(
                     f"Failed to get children from subtensor {netuid_}: {err_mg}"
                 )
         await _render_table(get_hotkey_pub_ss58(wallet), netuid_children_tuples)
+        return netuid_children_tuples
     else:
         success, children, err_mg = await subtensor.get_children(
             get_hotkey_pub_ss58(wallet), netuid
@@ -503,7 +504,7 @@ async def _render_table(
             netuid_children_tuples = [(netuid, children)]
             await _render_table(get_hotkey_pub_ss58(wallet), netuid_children_tuples)
 
-        return children
+        return netuid_children_tuples
 
 
 async def set_children(
@@ -790,7 +791,7 @@ async def set_chk_take_subnet(
             print_error(f"Unable to set childkey take. {message}")
             return False, ext_id_
 
-    # Print childkey take for other user and return (dont offer to change take rate)
+    # Print childkey take for other user and return (don't offer to change take rate)
     wallet_hk = get_hotkey_pub_ss58(wallet)
     if not hotkey or hotkey == wallet_hk:
         hotkey = wallet_hk

From 7a742765a13f6bfd41a86d06244e634a13064b75 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Tue, 7 Apr 2026 21:08:05 +0200
Subject: [PATCH 08/30] Check-in

---
 .../src/bittensor/subtensor_interface.py      |   2 +-
 .../src/commands/stake/children_hotkeys.py    |  15 +-
 tests/e2e_tests/test_children_hotkeys.py      | 286 ++++++++++++++++++
 3 files changed, 297 insertions(+), 6 deletions(-)

diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index dc988d0c8..240c36ed5 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -175,7 +175,7 @@ async def _decode_inline_call(
             "Call",
             data=ScaleBytes(call_option["Inline"]),
             block_hash=block_hash,
-            runtime=runtime
+            runtime=runtime,
         )
         call_value = call_obj.decode()
 
diff --git a/bittensor_cli/src/commands/stake/children_hotkeys.py b/bittensor_cli/src/commands/stake/children_hotkeys.py
index d4bfbfa10..0c7bf9dd1 100644
--- a/bittensor_cli/src/commands/stake/children_hotkeys.py
+++ b/bittensor_cli/src/commands/stake/children_hotkeys.py
@@ -1,5 +1,6 @@
 import asyncio
 import json
+from collections import defaultdict
 from typing import Optional
 
 from bittensor_wallet import Wallet
@@ -25,6 +26,7 @@
     json_console,
     get_hotkey_pub_ss58,
     print_extrinsic_id,
+    err_console,
 )
 
 
@@ -493,7 +495,6 @@ async def _render_table(
                     f"Failed to get children from subtensor {netuid_}: {err_mg}"
                 )
         await _render_table(get_hotkey_pub_ss58(wallet), netuid_children_tuples)
-        return netuid_children_tuples
     else:
         success, children, err_mg = await subtensor.get_children(
             get_hotkey_pub_ss58(wallet), netuid
@@ -503,8 +504,11 @@ async def _render_table(
         if children:
             netuid_children_tuples = [(netuid, children)]
             await _render_table(get_hotkey_pub_ss58(wallet), netuid_children_tuples)
-
-        return netuid_children_tuples
+    output = defaultdict(dict)
+    for netuid_, children_ in netuid_children_tuples:
+        for proportion_, addr in children_:
+            output[netuid][addr] = proportion_
+    return output
 
 
 async def set_children(
@@ -795,7 +799,8 @@ async def set_chk_take_subnet(
     wallet_hk = get_hotkey_pub_ss58(wallet)
     if not hotkey or hotkey == wallet_hk:
         hotkey = wallet_hk
-    if hotkey != wallet_hk or not take:
+    # TODO get rid of this check, holy shit this is all so fucking bad
+    if hotkey == wallet_hk or not take:
         # display childkey take for other users
         if netuid:
             await display_chk_take(hotkey, netuid)
@@ -854,7 +859,7 @@ async def set_chk_take_subnet(
                     subtensor=subtensor,
                     wallet=wallet,
                     netuid=netuid_,
-                    hotkey=wallet_hk,
+                    hotkey=hotkey,
                     take=take,
                     proxy=proxy,
                     prompt=prompt,
diff --git a/tests/e2e_tests/test_children_hotkeys.py b/tests/e2e_tests/test_children_hotkeys.py
index f286012fd..bf9ce2a95 100644
--- a/tests/e2e_tests/test_children_hotkeys.py
+++ b/tests/e2e_tests/test_children_hotkeys.py
@@ -1,6 +1,10 @@
+import json
+import time
+
 import pytest
 
 from bittensor_cli.src.bittensor.subtensor_interface import SubtensorInterface
+from bittensor_cli.src.bittensor.utils import U64_MAX
 from bittensor_cli.src.commands.stake.children_hotkeys import (
     get_childkey_completion_block,
 )
@@ -13,3 +17,285 @@ async def test_get_childkey_completion_block(local_chain):
             subtensor, 1
         )
         assert (completion_block - current_block) >= 7200
+
+
+def test_children_hotkeys(local_chain, wallet_setup):
+    """
+    Test child hotkey set, get, take, and revoke flows using Alice (parent) and Bob (child).
+
+    Steps:
+        1. Setup: Create a subnet, register Alice and Bob.
+        2. Set: Alice sets Bob as a child hotkey with proportion 0.5 on the subnet.
+        3. Get: Verify Bob appears as Alice's child hotkey.
+        4. Take: Alice sets a child take for Bob on the subnet.
+        5. Revoke: Alice revokes Bob as a child hotkey.
+        6. Get: Verify Bob no longer appears as Alice's child hotkey.
+    """
+    print("Testing child hotkey commands 🧪")
+
+    keypair_alice, wallet_alice, wallet_path_alice, exec_command_alice = wallet_setup(
+        "//Alice"
+    )
+    keypair_bob, wallet_bob, wallet_path_bob, exec_command_bob = wallet_setup("//Bob")
+
+    # Create a subnet for testing
+    create_subnet_result = exec_command_alice(
+        command="subnets",
+        sub_command="create",
+        extra_args=[
+            "--wallet-path",
+            wallet_path_alice,
+            "--chain",
+            "ws://127.0.0.1:9945",
+            "--wallet-name",
+            wallet_alice.name,
+            "--wallet-hotkey",
+            wallet_alice.hotkey_str,
+            "--subnet-name",
+            "Test Subnet",
+            "--repo",
+            "https://github.com/username/repo",
+            "--contact",
+            "alice@opentensor.dev",
+            "--url",
+            "https://testsubnet.com",
+            "--discord",
+            "alice#1234",
+            "--description",
+            "A test subnet for child hotkey e2e testing",
+            "--additional-info",
+            "Created by Alice",
+            "--logo-url",
+            "https://testsubnet.com/logo.png",
+            "--no-prompt",
+            "--json-output",
+        ],
+    )
+    create_subnet_payload = json.loads(create_subnet_result.stdout)
+    assert create_subnet_payload["success"] is True
+    netuid = create_subnet_payload["netuid"]
+
+    # Start emission schedule for the subnet
+    start_emission_result = exec_command_alice(
+        command="subnets",
+        sub_command="start",
+        extra_args=[
+            "--netuid",
+            str(netuid),
+            "--wallet-name",
+            wallet_alice.name,
+            "--no-prompt",
+            "--chain",
+            "ws://127.0.0.1:9945",
+            "--wallet-path",
+            wallet_path_alice,
+        ],
+    )
+    assert (
+        f"Successfully started subnet {netuid}'s emission schedule."
+        in start_emission_result.stdout
+    )
+
+    # Register Bob on the subnet
+    register_bob_result = exec_command_bob(
+        command="subnets",
+        sub_command="register",
+        extra_args=[
+            "--netuid",
+            str(netuid),
+            "--wallet-path",
+            wallet_path_bob,
+            "--wallet-name",
+            wallet_bob.name,
+            "--hotkey",
+            wallet_bob.hotkey_str,
+            "--chain",
+            "ws://127.0.0.1:9945",
+            "--no-prompt",
+        ],
+    )
+    assert "✅ Registered" in register_bob_result.stdout, register_bob_result.stderr
+
+    time.sleep(3)
+
+    ################################
+    # TEST 1: Set child hotkey
+    # Alice sets Bob as a child with 50% proportion
+    ################################
+
+    set_children_result = exec_command_alice(
+        command="stake",
+        sub_command="child",
+        extra_args=[
+            "set",
+            "--children",
+            wallet_bob.hotkey.ss58_address,
+            "--proportions",
+            "0.5",  # 50%
+            "--netuid",
+            str(netuid),
+            "--wallet-path",
+            wallet_path_alice,
+            "--wallet-name",
+            wallet_alice.name,
+            "--wallet-hotkey",
+            wallet_alice.hotkey_str,
+            "--chain",
+            "ws://127.0.0.1:9945",
+            "--no-prompt",
+            "--wait-for-inclusion",
+            "--wait-for-finalization",
+        ],
+    )
+    assert "Set children hotkeys" in set_children_result.stdout, (
+        set_children_result.stderr
+    )
+
+    time.sleep(8)
+    ################################
+    # TEST 2: Get child hotkeys
+    # Verify Bob is listed as Alice's child on the subnet
+    ################################
+    get_children_result = exec_command_alice(
+        command="stake",
+        sub_command="child",
+        extra_args=[
+            "get",
+            "--netuid",
+            str(netuid),
+            "--wallet-path",
+            wallet_path_alice,
+            "--wallet-name",
+            wallet_alice.name,
+            "--wallet-hotkey",
+            wallet_alice.hotkey_str,
+            "--network",
+            "ws://127.0.0.1:9945",
+            "--json-output",
+            "--verbose",
+        ],
+    )
+    get_children_result_json = json.loads(get_children_result.stdout)
+    # should be 50% which is U64_MAX / 2
+    assert get_children_result_json[str(netuid)][wallet_bob.hotkey.ss58_address] == int(
+        U64_MAX / 2
+    ), (
+        f"Bob's hotkey not found in children output:\n{get_children_result.stdout} | {get_children_result.stderr}"
+    )
+    time.sleep(3)
+    ################################
+    # TEST 3: Set child take
+    # Alice sets a 10% take for Bob as child hotkey on the subnet
+    ################################
+
+    set_take_result = exec_command_alice(
+        command="stake",
+        sub_command="child",
+        extra_args=[
+            "take",
+            "--child-hotkey-ss58",
+            wallet_bob.hotkey.ss58_address,
+            "--netuid",
+            str(netuid),
+            "--take",
+            "0.10",
+            "--wallet-path",
+            wallet_path_alice,
+            "--wallet-name",
+            wallet_alice.name,
+            "--chain",
+            "ws://127.0.0.1:9945",
+            "--no-prompt",
+            "--wait-for-inclusion",
+            "--wait-for-finalization",
+            "--verbose",
+        ],
+    )
+    assert (
+        "Child take set" in set_take_result.stdout or "✅" in set_take_result.stdout
+    ), f"Take not set:\n{set_take_result.stdout}\n{set_take_result.stderr}"
+
+    # TODO Does not work yet. Think the issue is in the take setting above, still investigating
+    time.sleep(500)
+    # Verify the take value was applied
+    get_take_result = exec_command_alice(
+        command="stake",
+        sub_command="child",
+        extra_args=[
+            "take",
+            "--child-hotkey-ss58",
+            wallet_bob.hotkey.ss58_address,
+            "--netuid",
+            str(netuid),
+            "--wallet-path",
+            wallet_path_alice,
+            "--wallet-name",
+            wallet_alice.name,
+            "--wallet-hotkey",
+            wallet_alice.hotkey_str,
+            "--chain",
+            "ws://127.0.0.1:9945",
+            "--no-prompt",
+            "--verbose",
+        ],
+    )
+    print(get_take_result.stdout, get_take_result.stderr)
+    assert "10.00%" in get_take_result.stdout, (
+        f"Expected 10.00% take not found:\n{get_take_result.stdout}"
+    )
+
+    ################################
+    # TEST 4: Revoke child hotkeys
+    # Alice revokes Bob as a child hotkey on the subnet
+    ################################
+
+    revoke_children_result = exec_command_alice(
+        command="stake",
+        sub_command="child",
+        extra_args=[
+            "revoke",
+            "--netuid",
+            str(netuid),
+            "--wallet-path",
+            wallet_path_alice,
+            "--wallet-name",
+            wallet_alice.name,
+            "--wallet-hotkey",
+            wallet_alice.hotkey_str,
+            "--chain",
+            "ws://127.0.0.1:9945",
+            "--no-prompt",
+            "--wait-for-inclusion",
+            "--wait-for-finalization",
+        ],
+    )
+    assert "revocation request" in revoke_children_result.stdout.lower() or (
+        "✅" in revoke_children_result.stdout
+    ), (
+        f"Revoke did not succeed:\n{revoke_children_result.stdout}\n{revoke_children_result.stderr}"
+    )
+
+    # Verify Bob is no longer listed as a child
+    get_children_after_revoke = exec_command_alice(
+        command="stake",
+        sub_command="child",
+        extra_args=[
+            "get",
+            "--netuid",
+            str(netuid),
+            "--wallet-path",
+            wallet_path_alice,
+            "--wallet-name",
+            wallet_alice.name,
+            "--wallet-hotkey",
+            wallet_alice.hotkey_str,
+            "--chain",
+            "ws://127.0.0.1:9945",
+            "--no-prompt",
+        ],
+    )
+    assert wallet_bob.hotkey.ss58_address not in get_children_after_revoke.stdout, (
+        f"Bob's hotkey still found after revoke:\n{get_children_after_revoke.stdout}"
+    )
+
+    print("Passed child hotkey commands")

From 3597358b789d9fc7bbb1f3909ffcf14e4ab301aa Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Wed, 8 Apr 2026 13:26:58 +0200
Subject: [PATCH 09/30] Remove `decode_account_id` fn

---
 bittensor_cli/src/bittensor/chain_data.py     | 61 +++++++------------
 .../src/bittensor/subtensor_interface.py      | 16 ++---
 bittensor_cli/src/bittensor/utils.py          |  7 ---
 bittensor_cli/src/commands/sudo.py            |  6 +-
 4 files changed, 29 insertions(+), 61 deletions(-)

diff --git a/bittensor_cli/src/bittensor/chain_data.py b/bittensor_cli/src/bittensor/chain_data.py
index fbb4b7b83..7fd1e2049 100644
--- a/bittensor_cli/src/bittensor/chain_data.py
+++ b/bittensor_cli/src/bittensor/chain_data.py
@@ -13,7 +13,6 @@
     SS58_FORMAT,
     u16_normalized_float as u16tf,
     u64_normalized_float as u64tf,
-    decode_account_id,
     get_netuid_and_subuid_by_storage_index,
 )
 
@@ -39,8 +38,7 @@ class ChainDataType(Enum):
 
 def process_stake_data(stake_data, netuid):
     decoded_stake_data = {}
-    for account_id_bytes, stake_ in stake_data:
-        account_id = decode_account_id(account_id_bytes)
+    for account_id, stake_ in stake_data:
         decoded_stake_data.update(
             {account_id: Balance.from_rao(stake_).set_unit(netuid)}
         )
@@ -248,8 +246,8 @@ class StakeInfo(InfoBase):
 
     @classmethod
     def _fix_decoded(cls, decoded: Any) -> "StakeInfo":
-        hotkey = decode_account_id(decoded.get("hotkey"))
-        coldkey = decode_account_id(decoded.get("coldkey"))
+        hotkey = decoded.get("hotkey")
+        coldkey = decoded.get("coldkey")
         netuid = int(decoded.get("netuid"))
         stake = Balance.from_rao(decoded.get("stake")).set_unit(netuid)
         locked = Balance.from_rao(decoded.get("locked")).set_unit(netuid)
@@ -346,8 +344,8 @@ def _fix_decoded(cls, decoded: Any) -> "NeuronInfo":
         stake_dict = process_stake_data(decoded.get("stake"), netuid=netuid)
         total_stake = sum(stake_dict.values()) if stake_dict else Balance(0)
         axon_info = decoded.get("axon_info", {})
-        coldkey = decode_account_id(decoded.get("coldkey"))
-        hotkey = decode_account_id(decoded.get("hotkey"))
+        coldkey = decoded.get("coldkey")
+        hotkey = decoded.get("hotkey")
         return cls(
             hotkey=hotkey,
             coldkey=coldkey,
@@ -440,11 +438,11 @@ def get_null_neuron() -> "NeuronInfoLite":
     def _fix_decoded(cls, decoded: Union[dict, "NeuronInfoLite"]) -> "NeuronInfoLite":
         active = decoded.get("active")
         axon_info = decoded.get("axon_info", {})
-        coldkey = decode_account_id(decoded.get("coldkey"))
+        coldkey = decoded.get("coldkey")
         consensus = decoded.get("consensus")
         dividends = decoded.get("dividends")
         emission = decoded.get("emission")
-        hotkey = decode_account_id(decoded.get("hotkey"))
+        hotkey = decoded.get("hotkey")
         incentive = decoded.get("incentive")
         last_update = decoded.get("last_update")
         netuid = decoded.get("netuid")
@@ -525,12 +523,9 @@ class DelegateInfo(InfoBase):
 
     @classmethod
     def _fix_decoded(cls, decoded: "DelegateInfo") -> "DelegateInfo":
-        hotkey = decode_account_id(decoded.get("hotkey_ss58"))
-        owner = decode_account_id(decoded.get("owner_ss58"))
-        nominators = [
-            (decode_account_id(x), Balance.from_rao(y))
-            for x, y in decoded.get("nominators")
-        ]
+        hotkey = decoded.get("hotkey_ss58")
+        owner = decoded.get("owner_ss58")
+        nominators = [(x, Balance.from_rao(y)) for x, y in decoded.get("nominators")]
         total_stake = sum((x[1] for x in nominators)) if nominators else Balance(0)
         return cls(
             hotkey_ss58=hotkey,
@@ -631,7 +626,7 @@ def _fix_decoded(cls, decoded: "SubnetInfo") -> "SubnetInfo":
             },
             emission_value=decoded.get("emission_value"),
             burn=Balance.from_rao(decoded.get("burn")),
-            owner_ss58=decode_account_id(decoded.get("owner")),
+            owner_ss58=decoded.get("owner"),
         )
 
 
@@ -698,8 +693,8 @@ def _fix_decoded(cls, decoded: Any) -> "DynamicInfo":
         subnet_name = bytes([int(b) for b in decoded.get("subnet_name")]).decode()
         is_dynamic = True if netuid > 0 else False  # Patching for netuid 0
 
-        owner_hotkey = decode_account_id(decoded.get("owner_hotkey"))
-        owner_coldkey = decode_account_id(decoded.get("owner_coldkey"))
+        owner_hotkey = decoded.get("owner_hotkey")
+        owner_coldkey = decoded.get("owner_coldkey")
 
         emission = Balance.from_rao(decoded.get("emission")).set_unit(0)
         alpha_in = Balance.from_rao(decoded.get("alpha_in")).set_unit(netuid)
@@ -908,8 +903,8 @@ def _fix_decoded(cls, decoded: Any) -> "SubnetState":
         netuid = decoded.get("netuid")
         return cls(
             netuid=netuid,
-            hotkeys=[decode_account_id(val) for val in decoded.get("hotkeys")],
-            coldkeys=[decode_account_id(val) for val in decoded.get("coldkeys")],
+            hotkeys=decoded.get("hotkeys"),
+            coldkeys=decoded.get("coldkeys"),
             active=decoded.get("active"),
             validator_permit=decoded.get("validator_permit"),
             pruning_score=[u16tf(val) for val in decoded.get("pruning_score")],
@@ -1145,8 +1140,8 @@ def _fix_decoded(cls, decoded: dict) -> "MetagraphInfo":
             alpha_low=u16tf(decoded["alpha_low"]),
             bonds_moving_avg=u64tf(decoded["bonds_moving_avg"]),
             # Metagraph info.
-            hotkeys=[decode_account_id(ck) for ck in decoded.get("hotkeys", [])],
-            coldkeys=[decode_account_id(hk) for hk in decoded.get("coldkeys", [])],
+            hotkeys=decoded.get("hotkeys", []),
+            coldkeys=decoded.get("coldkeys", []),
             identities=decoded["identities"],
             axons=decoded.get("axons", []),
             active=decoded["active"],
@@ -1165,11 +1160,11 @@ def _fix_decoded(cls, decoded: dict) -> "MetagraphInfo":
             total_stake=[_tbwu(ts, _netuid) for ts in decoded["total_stake"]],
             # Dividend break down
             tao_dividends_per_hotkey=[
-                (decode_account_id(alpha[0]), _tbwu(alpha[1]))
+                (alpha[0], _tbwu(alpha[1]))
                 for alpha in decoded["tao_dividends_per_hotkey"]
             ],
             alpha_dividends_per_hotkey=[
-                (decode_account_id(adphk[0]), _tbwu(adphk[1], _netuid))
+                (adphk[0], _tbwu(adphk[1], _netuid))
                 for adphk in decoded["alpha_dividends_per_hotkey"]
             ],
         )
@@ -1209,21 +1204,9 @@ class CrowdloanData(InfoBase):
 
     @classmethod
     def _fix_decoded(cls, decoded: dict[str, Any]) -> "CrowdloanData":
-        creator = (
-            decode_account_id(creator_raw)
-            if (creator_raw := decoded.get("creator"))
-            else None
-        )
-        funds_account = (
-            decode_account_id(funds_raw)
-            if (funds_raw := decoded.get("funds_account"))
-            else None
-        )
-        target_address = (
-            decode_account_id(target_raw)
-            if (target_raw := decoded.get("target_address"))
-            else None
-        )
+        creator = decoded.get("creator")
+        funds_account = decoded.get("funds_account")
+        target_address = decoded.get("target_address")
         return cls(
             creator=creator,
             funds_account=funds_account,
diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index 240c36ed5..a572fa26f 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -23,7 +23,6 @@
     NeuronInfoLite,
     NeuronInfo,
     SubnetHyperparameters,
-    decode_account_id,
     DynamicInfo,
     SubnetState,
     MetagraphInfo,
@@ -278,8 +277,7 @@ async def get_auto_stake_destinations(
         )
         destinations: dict[int, str] = {}
         for netuid, destination in query.records:
-            hotkey_ss58 = decode_account_id(destination.value[0])
-            if hotkey_ss58:
+            if hotkey_ss58 := destination.value[0]:
                 destinations[int(netuid)] = hotkey_ss58
         return destinations
 
@@ -1830,8 +1828,7 @@ async def get_coldkey_swap_announcements(
         )
 
         announcements = []
-        for ss58, data in result.records:
-            coldkey = decode_account_id(ss58)
+        for coldkey, data in result.records:
             announcements.append(
                 ColdkeySwapAnnouncementInfo._fix_decoded(coldkey, data)
             )
@@ -1890,8 +1887,7 @@ async def get_coldkey_swap_disputes(
         )
 
         disputes: list[tuple[str, int]] = []
-        for ss58, data in result.records:
-            coldkey = decode_account_id(ss58)
+        for coldkey, data in result.records:
             disputes.append((coldkey, data.value))
         return disputes
 
@@ -2204,8 +2200,7 @@ async def get_all_coldkeys_claim_type(
         )
 
         root_claim_types = {}
-        for coldkey, claim_type_data in result.records:
-            coldkey_ss58 = decode_account_id(coldkey[0])
+        for coldkey_ss58, claim_type_data in result.records:
             claim_type_key = claim_type_data.value
 
             if claim_type_key == "KeepSubnets":
@@ -2243,8 +2238,7 @@ async def get_staking_hotkeys(
             block_hash=block_hash,
             reuse_block_hash=reuse_block,
         )
-        staked_hotkeys = [decode_account_id(hotkey) for hotkey in result]
-        return staked_hotkeys
+        return result
 
     async def get_claimed_amount(
         self,
diff --git a/bittensor_cli/src/bittensor/utils.py b/bittensor_cli/src/bittensor/utils.py
index 4657ee4c5..77fe560db 100644
--- a/bittensor_cli/src/bittensor/utils.py
+++ b/bittensor_cli/src/bittensor/utils.py
@@ -633,13 +633,6 @@ def is_valid_bittensor_address_or_public_key(address: Union[str, bytes]) -> bool
         return False
 
 
-def decode_account_id(account_id_bytes: str) -> str:
-    """
-    Does nothing. Retained for compatibility til v10
-    """
-    return account_id_bytes
-
-
 def encode_account_id(ss58_address: str) -> bytes:
     return bytes.fromhex(ss58_decode(ss58_address, SS58_FORMAT))
 
diff --git a/bittensor_cli/src/commands/sudo.py b/bittensor_cli/src/commands/sudo.py
index 9a7136729..296c49c22 100644
--- a/bittensor_cli/src/commands/sudo.py
+++ b/bittensor_cli/src/commands/sudo.py
@@ -21,7 +21,6 @@
 from bittensor_cli.src.bittensor.extrinsics.mev_shield import (
     wait_for_extrinsic_by_hash,
 )
-from bittensor_cli.src.bittensor.chain_data import decode_account_id
 from bittensor_cli.src.bittensor.utils import (
     confirm_action,
     console,
@@ -686,9 +685,8 @@ async def _get_senate_members(
         block_hash=block_hash,
     )
     try:
-        return [
-            decode_account_id(i[x][0]) for i in senate_members for x in range(len(i))
-        ]
+        # TODO double-check the decode logic here
+        return [i[x] for i in senate_members for x in range(len(i))]
     except (IndexError, TypeError):
         print_error("Unable to retrieve senate members.")
         return []

From b7427624e2c6dae76aa38a148b4c16f7088538a1 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Wed, 8 Apr 2026 15:22:24 +0200
Subject: [PATCH 10/30] Fixed tests and issues with child key setting.

---
 bittensor_cli/cli.py                          |  2 +
 .../src/commands/stake/children_hotkeys.py    | 22 ++--------
 tests/e2e_tests/test_children_hotkeys.py      | 44 +++++--------------
 3 files changed, 16 insertions(+), 52 deletions(-)

diff --git a/bittensor_cli/cli.py b/bittensor_cli/cli.py
index ab92d1753..421a597d6 100755
--- a/bittensor_cli/cli.py
+++ b/bittensor_cli/cli.py
@@ -6551,6 +6551,7 @@ def stake_childkey_take(
         wait_for_inclusion: bool = Options.wait_for_inclusion,
         wait_for_finalization: bool = Options.wait_for_finalization,
         prompt: bool = Options.prompt,
+        decline: bool = Options.decline,
         quiet: bool = Options.quiet,
         verbose: bool = Options.verbose,
         json_output: bool = Options.json_output,
@@ -6608,6 +6609,7 @@ def stake_childkey_take(
                 wait_for_inclusion=wait_for_inclusion,
                 wait_for_finalization=wait_for_finalization,
                 prompt=prompt,
+                decline=decline,
             )
         )
         if json_output:
diff --git a/bittensor_cli/src/commands/stake/children_hotkeys.py b/bittensor_cli/src/commands/stake/children_hotkeys.py
index 0c7bf9dd1..10031a340 100644
--- a/bittensor_cli/src/commands/stake/children_hotkeys.py
+++ b/bittensor_cli/src/commands/stake/children_hotkeys.py
@@ -799,24 +799,10 @@ async def set_chk_take_subnet(
     wallet_hk = get_hotkey_pub_ss58(wallet)
     if not hotkey or hotkey == wallet_hk:
         hotkey = wallet_hk
-    # TODO get rid of this check, holy shit this is all so fucking bad
-    if hotkey == wallet_hk or not take:
-        # display childkey take for other users
-        if netuid:
-            await display_chk_take(hotkey, netuid)
-            if take:
-                console.print(
-                    f"Hotkey {hotkey} not associated with wallet {wallet.name}."
-                )
-                return [(netuid, False, None)]
-        else:
-            # show child hotkey take on all subnets
-            await chk_all_subnets(hotkey)
-            if take:
-                console.print(
-                    f"Hotkey {hotkey} not associated with wallet {wallet.name}."
-                )
-                return [(netuid, False, None)]
+    if netuid:
+        await display_chk_take(hotkey, netuid)
+    else:
+        await chk_all_subnets(hotkey)
 
     # Validate child SS58 addresses
     if not take:
diff --git a/tests/e2e_tests/test_children_hotkeys.py b/tests/e2e_tests/test_children_hotkeys.py
index bf9ce2a95..2b1d80681 100644
--- a/tests/e2e_tests/test_children_hotkeys.py
+++ b/tests/e2e_tests/test_children_hotkeys.py
@@ -68,11 +68,15 @@ def test_children_hotkeys(local_chain, wallet_setup):
             "--logo-url",
             "https://testsubnet.com/logo.png",
             "--no-prompt",
+            "--no-mev-protection",
             "--json-output",
         ],
     )
     create_subnet_payload = json.loads(create_subnet_result.stdout)
-    assert create_subnet_payload["success"] is True
+    assert create_subnet_payload["success"] is True, (
+        create_subnet_result.stdout,
+        create_subnet_result.stderr,
+    )
     netuid = create_subnet_payload["netuid"]
 
     # Start emission schedule for the subnet
@@ -208,44 +212,16 @@ def test_children_hotkeys(local_chain, wallet_setup):
             "--no-prompt",
             "--wait-for-inclusion",
             "--wait-for-finalization",
-            "--verbose",
-        ],
-    )
-    assert (
-        "Child take set" in set_take_result.stdout or "✅" in set_take_result.stdout
-    ), f"Take not set:\n{set_take_result.stdout}\n{set_take_result.stderr}"
-
-    # TODO Does not work yet. Think the issue is in the take setting above, still investigating
-    time.sleep(500)
-    # Verify the take value was applied
-    get_take_result = exec_command_alice(
-        command="stake",
-        sub_command="child",
-        extra_args=[
-            "take",
-            "--child-hotkey-ss58",
-            wallet_bob.hotkey.ss58_address,
-            "--netuid",
-            str(netuid),
-            "--wallet-path",
-            wallet_path_alice,
-            "--wallet-name",
-            wallet_alice.name,
-            "--wallet-hotkey",
-            wallet_alice.hotkey_str,
-            "--chain",
-            "ws://127.0.0.1:9945",
-            "--no-prompt",
-            "--verbose",
+            "--json-output",
         ],
     )
-    print(get_take_result.stdout, get_take_result.stderr)
-    assert "10.00%" in get_take_result.stdout, (
-        f"Expected 10.00% take not found:\n{get_take_result.stdout}"
+    set_take_result_json = json.loads(set_take_result.stdout)
+    assert set_take_result_json[str(netuid)]["success"] is True, (
+        f"Take not set:\n{set_take_result.stdout}\n{set_take_result.stderr}"
     )
 
     ################################
-    # TEST 4: Revoke child hotkeys
+    # TEST 3: Revoke child hotkeys
     # Alice revokes Bob as a child hotkey on the subnet
     ################################
 

From 92cce619adf94b6b4c6368404fd3b51182c1083a Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Wed, 8 Apr 2026 15:25:37 +0200
Subject: [PATCH 11/30] Bump cyscale

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 786fdbb29..2c132013c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,7 +40,7 @@ dependencies = [
     "pycryptodome>=3.0.0,<4.0.0",
     "PyYAML~=6.0",
     "rich>=13.7,<15.0",
-    "cyscale==0.1.5",
+    "cyscale==0.1.6",
     "typer>=0.16",
     "typing_extensions>4.0.0; python_version<'3.11'",
     "bittensor-wallet==4.0.1",

From 5d0e609aa988f362092a1cc6bc7b35562f3937c3 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Wed, 8 Apr 2026 15:46:31 +0200
Subject: [PATCH 12/30] Fix setting to None

---
 bittensor_cli/src/commands/stake/children_hotkeys.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bittensor_cli/src/commands/stake/children_hotkeys.py b/bittensor_cli/src/commands/stake/children_hotkeys.py
index 10031a340..1bf036aff 100644
--- a/bittensor_cli/src/commands/stake/children_hotkeys.py
+++ b/bittensor_cli/src/commands/stake/children_hotkeys.py
@@ -672,7 +672,7 @@ async def revoke_children(
             success, message, ext_id = await set_children_extrinsic(
                 subtensor=subtensor,
                 wallet=wallet,
-                netuid=netuid,  # TODO should this be able to allow netuid = None ?
+                netuid=netuid_,
                 hotkey=get_hotkey_pub_ss58(wallet),
                 children_with_proportions=[],
                 proxy=proxy,

From d6667219568caa7ba125c0f1103941439aaf6fbf Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Fri, 10 Apr 2026 16:49:09 +0200
Subject: [PATCH 13/30] Pin to release branch of ASI

---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2c132013c..ac9178385 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,7 +29,7 @@ classifiers = [
 ]
 dependencies = [
     "wheel",
-    "async-substrate-interface>=1.6.2,<2.0.0",
+    "async-substrate-interface @ git+https://github.com/opentensor/async-substrate-interface.git@release/2.0.0",
     "aiohttp~=3.13",
     "backoff~=2.2.1",
     "bittensor-drand>=1.3.0",
@@ -40,7 +40,7 @@ dependencies = [
     "pycryptodome>=3.0.0,<4.0.0",
     "PyYAML~=6.0",
     "rich>=13.7,<15.0",
-    "cyscale==0.1.6",
+    "cyscale==0.1.10",
     "typer>=0.16",
     "typing_extensions>4.0.0; python_version<'3.11'",
     "bittensor-wallet==4.0.1",

From ff44f8fa625649c359a06f1f0037b3db4b51e8b0 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Fri, 10 Apr 2026 17:22:14 +0200
Subject: [PATCH 14/30] Update for new query_map and query return types

---
 .../src/bittensor/subtensor_interface.py      | 61 ++++++++++---------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index a572fa26f..46a376606 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -43,6 +43,7 @@
     get_hotkey_pub_ss58,
     ProxyAnnouncements,
 )
+from scalecodec.base import ScaleType
 
 GENESIS_ADDRESS = "5C4hrfjw9DjXZTzV3MwzrrAr9P1MJhSrvWGWqi1eSuyUpnhM"
 
@@ -146,9 +147,9 @@ async def query(
         reuse_block_hash: bool = False,
     ) -> Any:
         """
-        Pass-through to substrate.query which automatically returns the .value if it's a ScaleObj
+        Pass-through to substrate.query which automatically returns the .value if it's a ScaleType
         """
-        result = await self.substrate.query(
+        result: Optional[ScaleType] = await self.substrate.query(
             module,
             storage_function,
             params,
@@ -221,7 +222,7 @@ async def get_all_subnet_netuids(
         )
         res = []
         for netuid, exists in result.records:
-            if exists.value:
+            if exists:
                 res.append(netuid)
         return res
 
@@ -277,7 +278,7 @@ async def get_auto_stake_destinations(
         )
         destinations: dict[int, str] = {}
         for netuid, destination in query.records:
-            if hotkey_ss58 := destination.value[0]:
+            if hotkey_ss58 := destination[0]:
                 destinations[int(netuid)] = hotkey_ss58
         return destinations
 
@@ -335,9 +336,9 @@ async def query_runtime_api(
         """
         if reuse_block:
             block_hash = self.substrate.last_block_hash
-        result = (
-            await self.substrate.runtime_call(runtime_api, method, params, block_hash)
-        ).value
+        result = await self.substrate.runtime_call(
+            runtime_api, method, params, block_hash
+        )
 
         return result
 
@@ -566,7 +567,7 @@ async def get_netuids_for_hotkey(
         )
         res = []
         for record in result.records:
-            if record[1].value:
+            if record[1]:
                 res.append(record[0])
         return res
 
@@ -588,14 +589,14 @@ async def is_subnet_active(
 
         This means whether the `start_call` was initiated or not.
         """
-        query = await self.substrate.query(
+        query = await self.query(
             module="SubtensorModule",
             storage_function="FirstEmissionBlockNumber",
             block_hash=block_hash,
             reuse_block_hash=reuse_block,
             params=[netuid],
         )
-        return True if query and query.value > 0 else False
+        return True if query and query > 0 else False
 
     async def subnet_exists(
         self, netuid: int, block_hash: Optional[str] = None, reuse_block: bool = False
@@ -942,8 +943,7 @@ async def query_all_identities(
             fully_exhaust=True,
         )
         all_identities = {
-            ss58_address: identity.value
-            for (ss58_address, identity) in identities.records
+            ss58_address: identity for (ss58_address, identity) in identities.records
         }
 
         return all_identities
@@ -989,12 +989,10 @@ async def query_identity(
     async def fetch_coldkey_hotkey_identities(
         self,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> dict[str, dict]:
         """
         Builds a dictionary containing coldkeys and hotkeys with their associated identities and relationships.
         :param block_hash: The hash of the blockchain block number for the query.
-        :param reuse_block: Whether to reuse the last-used blockchain block hash.
         :return: Dict with 'coldkeys' and 'hotkeys' as keys.
         """
         if block_hash is None:
@@ -1051,7 +1049,7 @@ async def weights(
         )
         w_map = []
         async for uid, w in w_map_encoded:
-            w_map.append((uid, w.value))
+            w_map.append((uid, w))
 
         return w_map
 
@@ -1442,7 +1440,7 @@ async def get_all_subnet_mechanisms(
         )
         res = {}
         for netuid, count in results.records:
-            res[int(netuid)] = int(count.value)
+            res[int(netuid)] = int(count)
         return res
 
     async def get_mechanism_emission_split(
@@ -1888,7 +1886,7 @@ async def get_coldkey_swap_disputes(
 
         disputes: list[tuple[str, int]] = []
         for coldkey, data in result.records:
-            disputes.append((coldkey, data.value))
+            disputes.append((coldkey, data))
         return disputes
 
     async def get_coldkey_swap_dispute(
@@ -1922,7 +1920,7 @@ async def get_coldkey_swap_dispute(
 
     async def get_crowdloans(
         self, block_hash: Optional[str] = None
-    ) -> list[CrowdloanData]:
+    ) -> dict[int, CrowdloanData]:
         """Retrieves all crowdloans from the network.
 
         Args:
@@ -1946,7 +1944,7 @@ async def get_crowdloans(
                 fund_info["call"],
                 block_hash=block_hash,
             )
-            info_dict = dict(fund_info.value)
+            info_dict = dict(fund_info)
             info_dict["call_details"] = decoded_call
             crowdloans[fund_id] = CrowdloanData.from_any(info_dict)
 
@@ -2044,7 +2042,7 @@ async def get_crowdloan_contributors(
         contributor_contributions = {}
         for contributor_address, contribution_amount in contributors_data.records:
             try:
-                contribution_balance = Balance.from_rao(contribution_amount.value)
+                contribution_balance = Balance.from_rao(contribution_amount)
                 contributor_contributions[contributor_address] = contribution_balance
             except Exception:
                 continue
@@ -2178,7 +2176,7 @@ async def get_all_coldkeys_claim_type(
         self,
         block_hash: Optional[str] = None,
         reuse_block: bool = False,
-    ) -> dict[str, dict]:
+    ) -> dict[str, dict[str, str | list[int]]]:
         """
         Retrieves all root claim types for all coldkeys in the network.
 
@@ -2200,11 +2198,20 @@ async def get_all_coldkeys_claim_type(
         )
 
         root_claim_types = {}
-        for coldkey_ss58, claim_type_data in result.records:
-            claim_type_key = claim_type_data.value
+        coldkey_ss58: str
+        claim_type_key: str
+        claim_type_dict: dict
+        claim_type_data: str | dict
 
+        for coldkey_ss58, claim_type_data in result.records:
+            if isinstance(claim_type_data, str):
+                claim_type_key = claim_type_data
+                claim_type_dict = {}
+            else:
+                claim_type_key = next(iter(claim_type_data.keys()))
+                claim_type_dict = claim_type_data
             if claim_type_key == "KeepSubnets":
-                subnets_data = claim_type_data.value["KeepSubnets"]["subnets"]
+                subnets_data = claim_type_dict["KeepSubnets"]["subnets"]
                 subnet_list = sorted([subnet for subnet in subnets_data[0]])
                 root_claim_types[coldkey_ss58] = {
                     "type": "KeepSubnets",
@@ -2298,9 +2305,7 @@ async def get_claimed_amount_all_netuids(
         )
         total_claimed = {}
         for netuid, claimed in query.records:
-            total_claimed[netuid] = Balance.from_rao(claimed.value).set_unit(
-                netuid=netuid
-            )
+            total_claimed[netuid] = Balance.from_rao(claimed).set_unit(netuid=netuid)
         return total_claimed
 
     async def get_claimable_rate_all_netuids(
@@ -2556,7 +2561,7 @@ async def get_subnet_prices(
 
         map_ = {}
         for netuid_, current_sqrt_price in query.records:
-            current_sqrt_price_ = fixed_to_float(current_sqrt_price.value)
+            current_sqrt_price_ = fixed_to_float(current_sqrt_price)
             current_price = current_sqrt_price_**2
             map_[netuid_] = Balance.from_rao(int(current_price * 1e9))
 

From c5aaafe3f343bc522fa3f9f8ef1b0f25e01ad0f3 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Mon, 13 Apr 2026 20:46:35 +0200
Subject: [PATCH 15/30] Fixes

---
 bittensor_cli/src/commands/sudo.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/bittensor_cli/src/commands/sudo.py b/bittensor_cli/src/commands/sudo.py
index 296c49c22..6137ce29a 100644
--- a/bittensor_cli/src/commands/sudo.py
+++ b/bittensor_cli/src/commands/sudo.py
@@ -1052,9 +1052,7 @@ async def get_hyperparameters(
         if not await subtensor.subnet_exists(netuid):
             error_msg = f"Subnet with netuid {netuid} does not exist."
             if json_output:
-                json_str = json.dumps({"error": error_msg}, ensure_ascii=True)
-                sys.stdout.write(json_str + "\n")
-                sys.stdout.flush()
+                json_console.print_json(data={"error": error_msg})
             else:
                 print_error(error_msg)
             return False
@@ -1064,17 +1062,13 @@ async def get_hyperparameters(
         if subnet_info is None:
             error_msg = f"Subnet with netuid {netuid} does not exist."
             if json_output:
-                json_str = json.dumps({"error": error_msg}, ensure_ascii=True)
-                sys.stdout.write(json_str + "\n")
-                sys.stdout.flush()
+                json_console.print_json(data={"error": error_msg})
             else:
                 print_error(error_msg)
             return False
     except Exception as e:
         if json_output:
-            json_str = json.dumps({"error": str(e)}, ensure_ascii=True)
-            sys.stdout.write(json_str + "\n")
-            sys.stdout.flush()
+            json_console.print_json(data={"error": str(e)})
         else:
             raise
         return False

From aa12bcf9194726902e62cf403cb5db3ce4f61235 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Mon, 13 Apr 2026 20:46:45 +0200
Subject: [PATCH 16/30] Bump cyscale

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index ac9178385..e9f2f190a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,7 +40,7 @@ dependencies = [
     "pycryptodome>=3.0.0,<4.0.0",
     "PyYAML~=6.0",
     "rich>=13.7,<15.0",
-    "cyscale==0.1.10",
+    "cyscale==0.1.11",
     "typer>=0.16",
     "typing_extensions>4.0.0; python_version<'3.11'",
     "bittensor-wallet==4.0.1",

From 67266899beedec2f5e36e41c04c821f1d292e289 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Mon, 13 Apr 2026 20:54:49 +0200
Subject: [PATCH 17/30] Raise ValueError instead of implicitly returning None.
 Ensure we use error console for these prints.

---
 bittensor_cli/src/bittensor/utils.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bittensor_cli/src/bittensor/utils.py b/bittensor_cli/src/bittensor/utils.py
index 77fe560db..d0a54b115 100644
--- a/bittensor_cli/src/bittensor/utils.py
+++ b/bittensor_cli/src/bittensor/utils.py
@@ -833,7 +833,8 @@ def get_decoded(data: Optional[str]) -> str:
         try:
             return hex_to_bytes(data).decode()
         except (UnicodeDecodeError, ValueError):
-            print(f"Could not decode: {key}: {item}")
+            print_error(f"Could not decode: {key}: {item}")
+            raise ValueError
 
     for key, value in info_dictionary.items():
         if isinstance(value, dict):
@@ -842,7 +843,7 @@ def get_decoded(data: Optional[str]) -> str:
                 try:
                     info_dictionary[key] = get_decoded(item)
                 except UnicodeDecodeError:
-                    print(f"Could not decode: {key}: {item}")
+                    print_error(f"Could not decode: {key}: {item}")
             else:
                 info_dictionary[key] = item
         if key == "additional":

From 42a77bef11edba70e645ff581fec17b9d96f499e Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Mon, 13 Apr 2026 21:13:34 +0200
Subject: [PATCH 18/30] Remove reuse_block

---
 .../src/bittensor/extrinsics/registration.py  |   1 -
 .../src/bittensor/extrinsics/transfer.py      |   2 +-
 bittensor_cli/src/bittensor/minigraph.py      |   1 -
 .../src/bittensor/subtensor_interface.py      | 132 ++----------------
 .../src/commands/stake/auto_staking.py        |   1 -
 bittensor_cli/src/commands/sudo.py            |   2 +-
 bittensor_cli/src/commands/wallets.py         |   2 +-
 bittensor_cli/src/commands/weights.py         |   2 -
 8 files changed, 11 insertions(+), 132 deletions(-)

diff --git a/bittensor_cli/src/bittensor/extrinsics/registration.py b/bittensor_cli/src/bittensor/extrinsics/registration.py
index 237d4c3ec..e4cc4d183 100644
--- a/bittensor_cli/src/bittensor/extrinsics/registration.py
+++ b/bittensor_cli/src/bittensor/extrinsics/registration.py
@@ -784,7 +784,6 @@ async def burned_register_extrinsic(
                 subtensor.get_balance(
                     wallet.coldkeypub.ss58_address,
                     block_hash=block_hash,
-                    reuse_block=False,
                 ),
                 subtensor.get_netuids_for_hotkey(
                     get_hotkey_pub_ss58(wallet), block_hash=block_hash
diff --git a/bittensor_cli/src/bittensor/extrinsics/transfer.py b/bittensor_cli/src/bittensor/extrinsics/transfer.py
index 8875e5596..2d2369475 100644
--- a/bittensor_cli/src/bittensor/extrinsics/transfer.py
+++ b/bittensor_cli/src/bittensor/extrinsics/transfer.py
@@ -228,7 +228,7 @@ async def do_transfer() -> tuple[bool, str, str, Optional[AsyncExtrinsicReceipt]
     if success:
         with console.status(":satellite: Checking Balance...", spinner="aesthetic"):
             new_balance = await subtensor.get_balance(
-                proxy or wallet.coldkeypub.ss58_address, reuse_block=False
+                proxy or wallet.coldkeypub.ss58_address
             )
             console.print(
                 f"Balance:\n"
diff --git a/bittensor_cli/src/bittensor/minigraph.py b/bittensor_cli/src/bittensor/minigraph.py
index 9e149c1bb..24a5b0292 100644
--- a/bittensor_cli/src/bittensor/minigraph.py
+++ b/bittensor_cli/src/bittensor/minigraph.py
@@ -219,7 +219,6 @@ async def get_total_subnets():
                 module="SubtensorModule",
                 storage_function="TotalNetworks",
                 params=[],
-                reuse_block_hash=True,
             )
             return _result
 
diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index 46a376606..04c750415 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -144,7 +144,6 @@ async def query(
         block_hash: Optional[str] = None,
         raw_storage_key: Optional[bytes] = None,
         subscription_handler=None,
-        reuse_block_hash: bool = False,
     ) -> Any:
         """
         Pass-through to substrate.query which automatically returns the .value if it's a ScaleType
@@ -156,7 +155,6 @@ async def query(
             block_hash,
             raw_storage_key,
             subscription_handler,
-            reuse_block_hash,
         )
         return getattr(result, "value", result)
 
@@ -216,7 +214,6 @@ async def get_all_subnet_netuids(
             module="SubtensorModule",
             storage_function="NetworksAdded",
             block_hash=block_hash,
-            reuse_block_hash=True,
             fully_exhaust=True,
             page_size=200,
         )
@@ -230,7 +227,6 @@ async def get_stake_for_coldkey(
         self,
         coldkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> list[StakeInfo]:
         """
         Retrieves stake information associated with a specific coldkey. This function provides details
@@ -238,7 +234,6 @@ async def get_stake_for_coldkey(
 
         :param coldkey_ss58: The ``SS58`` address of the account's coldkey.
         :param block_hash: The hash of the blockchain block number for the query.
-        :param reuse_block: Whether to reuse the last-used block hash.
 
         :return: A list of StakeInfo objects detailing the stake allocations for the account.
 
@@ -251,7 +246,6 @@ async def get_stake_for_coldkey(
             method="get_stake_info_for_coldkey",
             params=[coldkey_ss58],
             block_hash=block_hash,
-            reuse_block=reuse_block,
         )
 
         if result is None:
@@ -263,7 +257,6 @@ async def get_auto_stake_destinations(
         self,
         coldkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> dict[int, str]:
         """Retrieve auto-stake destinations configured for a coldkey."""
 
@@ -272,7 +265,6 @@ async def get_auto_stake_destinations(
             storage_function="AutoStakeDestination",
             params=[coldkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
             fully_exhaust=True,
             page_size=200,
         )
@@ -316,7 +308,6 @@ async def query_runtime_api(
         method: str,
         params: Optional[Union[list, dict]] = None,
         block_hash: Optional[str] = None,
-        reuse_block: Optional[bool] = False,
     ) -> Optional[Any]:
         """
         Queries the runtime API of the Bittensor blockchain, providing a way to interact with the underlying
@@ -327,15 +318,12 @@ async def query_runtime_api(
         :param method: The specific method within the runtime API to call.
         :param params: The parameters to pass to the method call.
         :param block_hash: The hash of the blockchain block number at which to perform the query.
-        :param reuse_block: Whether to reuse the last-used block hash.
 
         :return: The decoded result from the runtime API call, or ``None`` if the call fails.
 
         This function enables access to the deeper layers of the Bittensor blockchain, allowing for detailed
         and specific interactions with the network's runtime environment.
         """
-        if reuse_block:
-            block_hash = self.substrate.last_block_hash
         result = await self.substrate.runtime_call(
             runtime_api, method, params, block_hash
         )
@@ -346,14 +334,12 @@ async def get_balance(
         self,
         address: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> Balance:
         """
         Retrieves the balance for a single coldkey address
 
         :param address: coldkey address
         :param block_hash: the block hash, optional
-        :param reuse_block: Whether to reuse the last-used block hash when retrieving info.
         :return: Balance object representing the address's balance
         """
         result = await self.query(
@@ -361,7 +347,6 @@ async def get_balance(
             storage_function="Account",
             params=[address],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
         value = result or {"data": {"free": 0}}
         return Balance(value["data"]["free"])
@@ -370,17 +355,15 @@ async def get_balances(
         self,
         *addresses: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> dict[str, Balance]:
         """
         Retrieves the balance for given coldkey(s)
         :param addresses: coldkey addresses(s)
         :param block_hash: the block hash, optional
-        :param reuse_block: Whether to reuse the last-used block hash when retrieving info.
         :return: dict of {address: Balance objects}
         """
-        if reuse_block:
-            block_hash = self.substrate.last_block_hash
+        if not block_hash:
+            block_hash = await self.substrate.get_chain_head()
         calls = [
             (
                 await self.substrate.create_storage_key(
@@ -450,7 +433,6 @@ async def get_total_stake_for_hotkey(
         *ss58_addresses,
         netuids: Optional[list[int]] = None,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> dict[str, dict[int, Balance]]:
         """
         Returns the total stake held on a hotkey.
@@ -458,7 +440,6 @@ async def get_total_stake_for_hotkey(
         :param ss58_addresses: The SS58 address(es) of the hotkey(s)
         :param netuids: The netuids to retrieve the stake from. If not specified, will use all subnets.
         :param block_hash: The hash of the block number to retrieve the stake from.
-        :param reuse_block: Whether to reuse the last-used block hash when retrieving info.
 
         :return:
             {
@@ -476,10 +457,7 @@ async def get_total_stake_for_hotkey(
             }
         """
         if not block_hash:
-            if reuse_block:
-                block_hash = self.substrate.last_block_hash
-            else:
-                block_hash = await self.substrate.get_chain_head()
+            block_hash = await self.substrate.get_chain_head()
 
         netuids = netuids or await self.get_all_subnet_netuids(block_hash=block_hash)
         calls = [
@@ -511,7 +489,6 @@ async def current_take(
         self,
         hotkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> Optional[float]:
         """
         Retrieves the delegate 'take' percentage for a neuron identified by its hotkey. The 'take'
@@ -519,7 +496,6 @@ async def current_take(
 
         :param hotkey_ss58: The `SS58` address of the neuron's hotkey.
         :param block_hash: The hash of the block number to retrieve the stake from.
-        :param reuse_block: Whether to reuse the last-used block hash when retrieving info.
 
         :return: The delegate take percentage, None if not available.
 
@@ -531,7 +507,6 @@ async def current_take(
             storage_function="Delegates",
             params=[hotkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
         if result is None:
             return None
@@ -542,7 +517,6 @@ async def get_netuids_for_hotkey(
         self,
         hotkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> list[int]:
         """
         Retrieves a list of subnet UIDs (netuids) for which a given hotkey is a member. This function
@@ -551,7 +525,6 @@ async def get_netuids_for_hotkey(
 
         :param hotkey_ss58: The ``SS58`` address of the neuron's hotkey.
         :param block_hash: The hash of the blockchain block number at which to perform the query.
-        :param reuse_block: Whether to reuse the last-used block hash when retrieving info.
 
         :return: A list of netuids where the neuron is a member.
         """
@@ -561,7 +534,6 @@ async def get_netuids_for_hotkey(
             storage_function="IsNetworkMember",
             params=[hotkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
             fully_exhaust=True,
             page_size=200,
         )
@@ -575,14 +547,12 @@ async def is_subnet_active(
         self,
         netuid: int,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> bool:
         """Verify if subnet with provided netuid is active.
 
         Args:
             netuid (int): The unique identifier of the subnet.
             block_hash (Optional[str]): The blockchain block_hash representation of block id.
-            reuse_block (bool): Whether to reuse the last-used block hash.
 
         Returns:
             True if subnet is active, False otherwise.
@@ -593,20 +563,18 @@ async def is_subnet_active(
             module="SubtensorModule",
             storage_function="FirstEmissionBlockNumber",
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
             params=[netuid],
         )
         return True if query and query > 0 else False
 
     async def subnet_exists(
-        self, netuid: int, block_hash: Optional[str] = None, reuse_block: bool = False
+        self, netuid: int, block_hash: Optional[str] = None
     ) -> bool:
         """
         Checks if a subnet with the specified unique identifier (netuid) exists within the Bittensor network.
 
         :param netuid: The unique identifier of the subnet.
         :param block_hash: The hash of the blockchain block number at which to check the subnet existence.
-        :param reuse_block: Whether to reuse the last-used block hash.
 
         :return: `True` if the subnet exists, `False` otherwise.
 
@@ -618,18 +586,14 @@ async def subnet_exists(
             storage_function="NetworksAdded",
             params=[netuid],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
         return result
 
-    async def total_networks(
-        self, block_hash: Optional[str] = None, reuse_block: bool = False
-    ) -> int:
+    async def total_networks(self, block_hash: Optional[str] = None) -> int:
         """
         Returns the total number of subnets in the Bittensor network.
 
         :param block_hash: The hash of the blockchain block number at which to check the subnet existence.
-        :param reuse_block: Whether to reuse the last-used block hash.
 
         :return: The total number of subnets in the network.
         """
@@ -638,7 +602,6 @@ async def total_networks(
             storage_function="TotalNetworks",
             params=[],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
         return result
 
@@ -670,7 +633,6 @@ async def get_hyperparameter(
         param_name: str,
         netuid: int,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> Optional[Any]:
         """
         Retrieves a specified hyperparameter for a specific subnet.
@@ -678,7 +640,6 @@ async def get_hyperparameter(
         :param param_name: The name of the hyperparameter to retrieve.
         :param netuid: The unique identifier of the subnet.
         :param block_hash: The hash of blockchain block number for the query.
-        :param reuse_block: Whether to reuse the last-used block hash.
 
         :return: The value of the specified hyperparameter if the subnet exists, or None
         """
@@ -691,7 +652,6 @@ async def get_hyperparameter(
             storage_function=param_name,
             params=[netuid],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
 
         if result is None:
@@ -705,7 +665,6 @@ async def filter_netuids_by_registered_hotkeys(
         filter_for_netuids: Iterable[int],
         all_hotkeys: Iterable[Wallet],
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> list[int]:
         """
         Filters a given list of all netuids for certain specified netuids and hotkeys
@@ -714,7 +673,6 @@ async def filter_netuids_by_registered_hotkeys(
         :param filter_for_netuids: A subset of all_netuids to filter from the main list
         :param all_hotkeys: Hotkeys to filter from the main list
         :param block_hash: hash of the blockchain block number at which to perform the query.
-        :param reuse_block: whether to reuse the last-used blockchain hash when retrieving info.
 
         :return: the filtered list of netuids.
         """
@@ -724,7 +682,6 @@ async def filter_netuids_by_registered_hotkeys(
                 *[
                     self.get_netuids_for_hotkey(
                         get_hotkey_pub_ss58(wallet),
-                        reuse_block=reuse_block,
                         block_hash=block_hash,
                     )
                     for wallet in all_hotkeys
@@ -753,7 +710,7 @@ async def filter_netuids_by_registered_hotkeys(
         return list(set(all_netuids))
 
     async def get_existential_deposit(
-        self, block_hash: Optional[str] = None, reuse_block: bool = False
+        self, block_hash: Optional[str] = None
     ) -> Balance:
         """
         Retrieves the existential deposit amount for the Bittensor blockchain. The existential deposit
@@ -761,7 +718,6 @@ async def get_existential_deposit(
         balances below this threshold can be reaped to conserve network resources.
 
         :param block_hash: Block hash at which to query the deposit amount. If `None`, the current block is used.
-        :param reuse_block: Whether to reuse the last-used blockchain block hash.
 
         :return: The existential deposit amount
 
@@ -773,7 +729,6 @@ async def get_existential_deposit(
                 module_name="Balances",
                 constant_name="ExistentialDeposit",
                 block_hash=block_hash,
-                reuse_block_hash=reuse_block,
             ),
             "value",
             None,
@@ -819,7 +774,7 @@ async def neurons(
         return neurons
 
     async def neurons_lite(
-        self, netuid: int, block_hash: Optional[str] = None, reuse_block: bool = False
+        self, netuid: int, block_hash: Optional[str] = None
     ) -> list[NeuronInfoLite]:
         """
         Retrieves a list of neurons in a 'lite' format from a specific subnet of the Bittensor network.
@@ -828,7 +783,6 @@ async def neurons_lite(
 
         :param netuid: The unique identifier of the subnet.
         :param block_hash: The hash of the blockchain block number for the query.
-        :param reuse_block: Whether to reuse the last-used blockchain block hash.
 
         :return: A list of simplified neuron information for the subnet.
 
@@ -840,7 +794,6 @@ async def neurons_lite(
             method="get_neurons_lite",
             params=[netuid],
             block_hash=block_hash,
-            reuse_block=reuse_block,
         )
 
         if result is None:
@@ -888,7 +841,6 @@ async def get_delegated(
         self,
         coldkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> list[tuple[DelegateInfo, Balance]]:
         """
         Retrieves a list of delegates and their associated stakes for a given coldkey. This function
@@ -896,19 +848,12 @@ async def get_delegated(
 
         :param coldkey_ss58: The `SS58` address of the account's coldkey.
         :param block_hash: The hash of the blockchain block number for the query.
-        :param reuse_block: Whether to reuse the last-used blockchain block hash.
 
         :return: A list of tuples, each containing a delegate's information and staked amount.
 
         This function is important for account holders to understand their stake allocations and their
         involvement in the network's delegation and consensus mechanisms.
         """
-
-        block_hash = (
-            block_hash
-            if block_hash
-            else (self.substrate.last_block_hash if reuse_block else None)
-        )
         result = await self.query_runtime_api(
             runtime_api="DelegateInfoRuntimeApi",
             method="get_delegated",
@@ -924,13 +869,11 @@ async def get_delegated(
     async def query_all_identities(
         self,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> dict[str, dict]:
         """
         Queries all identities on the Bittensor blockchain.
 
         :param block_hash: The hash of the blockchain block number at which to perform the query.
-        :param reuse_block: Whether to reuse the last-used blockchain block hash.
 
         :return: A dictionary mapping addresses to their decoded identity data.
         """
@@ -939,7 +882,6 @@ async def query_all_identities(
             module="SubtensorModule",
             storage_function="IdentitiesV2",
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
             fully_exhaust=True,
         )
         all_identities = {
@@ -952,7 +894,6 @@ async def query_identity(
         self,
         key: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> dict:
         """
         Queries the identity of a neuron on the Bittensor blockchain using the given key. This function retrieves
@@ -965,7 +906,6 @@ async def query_identity(
 
         :param key: The key used to query the neuron's identity, typically the neuron's SS58 address.
         :param block_hash: The hash of the blockchain block number at which to perform the query.
-        :param reuse_block: Whether to reuse the last-used blockchain block hash.
 
         :return: An object containing the identity information of the neuron if found, ``None`` otherwise.
 
@@ -977,7 +917,6 @@ async def query_identity(
             storage_function="IdentitiesV2",
             params=[key],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
         if not identity_info:
             return {}
@@ -1087,14 +1026,12 @@ async def does_hotkey_exist(
         self,
         hotkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> bool:
         """
         Returns true if the hotkey is known by the chain and there are accounts.
 
         :param hotkey_ss58: The SS58 address of the hotkey.
         :param block_hash: The hash of the block number to check the hotkey against.
-        :param reuse_block: Whether to reuse the last-used blockchain hash.
 
         :return: `True` if the hotkey is known by the chain and there are accounts, `False` otherwise.
         """
@@ -1103,7 +1040,6 @@ async def does_hotkey_exist(
             storage_function="Owner",
             params=[hotkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
         return_val = result != GENESIS_ADDRESS
         return return_val
@@ -1473,7 +1409,6 @@ async def get_vote_data(
         self,
         proposal_hash: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> Optional["ProposalVoteData"]:
         """
         Retrieves the voting data for a specific proposal on the Bittensor blockchain. This data includes
@@ -1481,7 +1416,6 @@ async def get_vote_data(
 
         :param proposal_hash: The hash of the proposal for which voting data is requested.
         :param block_hash: The hash of the blockchain block number to query the voting data.
-        :param reuse_block: Whether to reuse the last-used blockchain block hash.
 
         :return: An object containing the proposal's voting data, or `None` if not found.
 
@@ -1493,7 +1427,6 @@ async def get_vote_data(
             storage_function="Voting",
             params=[proposal_hash],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
         if vote_data is None:
             return None
@@ -1686,14 +1619,12 @@ async def get_owned_hotkeys(
         self,
         coldkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> list[str]:
         """
         Retrieves all hotkeys owned by a specific coldkey address.
 
         :param coldkey_ss58: The SS58 address of the coldkey to query.
         :param block_hash: The hash of the blockchain block number for the query.
-        :param reuse_block: Whether to reuse the last-used blockchain block hash.
 
         :return: A list of hotkey SS58 addresses owned by the coldkey.
         """
@@ -1702,7 +1633,6 @@ async def get_owned_hotkeys(
             storage_function="OwnedHotkeys",
             params=[coldkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
         return owned_hotkeys
 
@@ -1805,13 +1735,11 @@ async def sim_swap(
     async def get_coldkey_swap_announcements(
         self,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> list[ColdkeySwapAnnouncementInfo]:
         """Fetches all pending coldkey swap announcements.
 
         Args:
             block_hash: Block hash at which to perform query.
-            reuse_block: Whether to reuse the last-used block hash.
 
         Returns:
             A list of ColdkeySwapAnnouncementInfo for all pending announcements.
@@ -1820,7 +1748,6 @@ async def get_coldkey_swap_announcements(
             module="SubtensorModule",
             storage_function="ColdkeySwapAnnouncements",
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
             fully_exhaust=True,
             page_size=200,
         )
@@ -1836,14 +1763,12 @@ async def get_coldkey_swap_announcement(
         self,
         coldkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> Optional[ColdkeySwapAnnouncementInfo]:
         """Fetches a pending coldkey swap announcement for a specific coldkey.
 
         Args:
             coldkey_ss58: The SS58 address of the coldkey to query.
             block_hash: Block hash at which to perform query.
-            reuse_block: Whether to reuse the last-used block hash.
 
         Returns:
             ColdkeySwapAnnouncementInfo if an announcement exists, None otherwise.
@@ -1853,7 +1778,6 @@ async def get_coldkey_swap_announcement(
             storage_function="ColdkeySwapAnnouncements",
             params=[coldkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
 
         if result is None:
@@ -1864,13 +1788,11 @@ async def get_coldkey_swap_announcement(
     async def get_coldkey_swap_disputes(
         self,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> list[tuple[str, int]]:
         """Fetch all coldkey swap disputes.
 
         Args:
             block_hash: Optional block hash at which to query storage.
-            reuse_block: Whether to reuse the last-used block hash.
 
         Returns:
             list[tuple[str, int]]: Tuples of `(coldkey_ss58, disputed_block)`.
@@ -1879,7 +1801,6 @@ async def get_coldkey_swap_disputes(
             module="SubtensorModule",
             storage_function="ColdkeySwapDisputes",
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
             fully_exhaust=True,
             page_size=200,
         )
@@ -1893,14 +1814,12 @@ async def get_coldkey_swap_dispute(
         self,
         coldkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> Optional[int]:
         """Fetch the disputed block for a given coldkey swap.
 
         Args:
             coldkey_ss58: Coldkey SS58 address.
             block_hash: Optional block hash at which to query storage.
-            reuse_block: Whether to reuse the last-used block hash.
 
         Returns:
             int | None: Block number when disputed, or None if no dispute exists.
@@ -1910,7 +1829,6 @@ async def get_coldkey_swap_dispute(
             storage_function="ColdkeySwapDisputes",
             params=[coldkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
 
         if result is None:
@@ -2052,7 +1970,6 @@ async def get_crowdloan_contributors(
     async def get_coldkey_swap_announcement_delay(
         self,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> int:
         """Retrieves the delay (in blocks) before a coldkey swap can be executed.
 
@@ -2061,7 +1978,6 @@ async def get_coldkey_swap_announcement_delay(
 
         Args:
             block_hash: The hash of the blockchain block number for the query.
-            reuse_block: Whether to reuse the last-used blockchain block hash.
 
         Returns:
             The number of blocks to wait after announcement.
@@ -2071,7 +1987,6 @@ async def get_coldkey_swap_announcement_delay(
             storage_function="ColdkeySwapAnnouncementDelay",
             params=[],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
 
         return result
@@ -2079,7 +1994,6 @@ async def get_coldkey_swap_announcement_delay(
     async def get_coldkey_swap_reannouncement_delay(
         self,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> int:
         """Retrieves the delay (in blocks) before the user can reannounce a coldkey swap.
 
@@ -2088,7 +2002,6 @@ async def get_coldkey_swap_reannouncement_delay(
 
         Args:
             block_hash: The hash of the blockchain block number for the query.
-            reuse_block: Whether to reuse the last-used blockchain block hash.
 
         Returns:
             The number of blocks to wait before reannouncing.
@@ -2098,7 +2011,6 @@ async def get_coldkey_swap_reannouncement_delay(
             storage_function="ColdkeySwapReannouncementDelay",
             params=[],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
 
         return result
@@ -2106,13 +2018,11 @@ async def get_coldkey_swap_reannouncement_delay(
     async def get_coldkey_swap_cost(
         self,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
-    ) -> Balance:
+    ) -> Optional[Balance]:
         """Retrieves the fee required to announce a coldkey swap.
 
         Args:
             block_hash: Block hash at which to query the constant.
-            reuse_block: Whether to reuse the last-used block hash.
 
         Returns:
             The swap cost as a Balance object. Returns 0 TAO if constant not found.
@@ -2121,7 +2031,6 @@ async def get_coldkey_swap_cost(
             module_name="SubtensorModule",
             constant_name="KeySwapCost",
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
         if swap_cost is None:
             return None
@@ -2131,7 +2040,6 @@ async def get_coldkey_claim_type(
         self,
         coldkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> dict:
         """
         Retrieves the root claim type for a specific coldkey.
@@ -2144,7 +2052,6 @@ async def get_coldkey_claim_type(
         Args:
             coldkey_ss58: The SS58 address of the coldkey to query.
             block_hash: The hash of the blockchain block number for the query.
-            reuse_block: Whether to reuse the last-used blockchain block hash.
 
         Returns:
             dict: Claim type information in one of these formats:
@@ -2157,7 +2064,6 @@ async def get_coldkey_claim_type(
             storage_function="RootClaimType",
             params=[coldkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
 
         if result is None:
@@ -2175,14 +2081,12 @@ async def get_coldkey_claim_type(
     async def get_all_coldkeys_claim_type(
         self,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> dict[str, dict[str, str | list[int]]]:
         """
         Retrieves all root claim types for all coldkeys in the network.
 
         Args:
             block_hash: The hash of the blockchain block number for the query.
-            reuse_block: Whether to reuse the last-used blockchain block hash.
 
         Returns:
             dict[str, dict]: Mapping of coldkey SS58 addresses to claim type dicts
@@ -2192,7 +2096,6 @@ async def get_all_coldkeys_claim_type(
             storage_function="RootClaimType",
             params=[],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
             fully_exhaust=True,
             page_size=1_000,
         )
@@ -2226,14 +2129,12 @@ async def get_staking_hotkeys(
         self,
         coldkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> list[str]:
         """Retrieves all hotkeys that a coldkey is staking to.
 
         Args:
             coldkey_ss58: The SS58 address of the coldkey.
             block_hash: The hash of the blockchain block for the query.
-            reuse_block: Whether to reuse the last-used blockchain block hash.
 
         Returns:
             list[str]: A list of hotkey SS58 addresses that the coldkey has staked to.
@@ -2243,7 +2144,6 @@ async def get_staking_hotkeys(
             storage_function="StakingHotkeys",
             params=[coldkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
         return result
 
@@ -2253,7 +2153,6 @@ async def get_claimed_amount(
         hotkey_ss58: str,
         netuid: int,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> Balance:
         """Retrieves the root claimed Alpha shares for coldkey from hotkey in provided subnet.
 
@@ -2262,7 +2161,6 @@ async def get_claimed_amount(
             hotkey_ss58: The SS58 address of the root validator.
             netuid: The unique identifier of the subnet.
             block_hash: The blockchain block hash for the query.
-            reuse_block: Whether to reuse the last-used blockchain block hash.
 
         Returns:
             Balance: The number of Alpha stake claimed from the root validator.
@@ -2272,7 +2170,6 @@ async def get_claimed_amount(
             storage_function="RootClaimed",
             params=[netuid, hotkey_ss58, coldkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
         return Balance.from_rao(query).set_unit(netuid=netuid)
 
@@ -2281,7 +2178,6 @@ async def get_claimed_amount_all_netuids(
         coldkey_ss58: str,
         hotkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> dict[int, Balance]:
         """Retrieves the root claimed Alpha shares for coldkey from hotkey in all subnets.
 
@@ -2289,7 +2185,6 @@ async def get_claimed_amount_all_netuids(
             coldkey_ss58: The SS58 address of the staker.
             hotkey_ss58: The SS58 address of the root validator.
             block_hash: The blockchain block hash for the query.
-            reuse_block: Whether to reuse the last-used blockchain block hash.
 
         Returns:
             dict[int, Balance]: Dictionary mapping netuid to claimed stake.
@@ -2299,7 +2194,6 @@ async def get_claimed_amount_all_netuids(
             storage_function="RootClaimed",
             params=[hotkey_ss58, coldkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
             fully_exhaust=True,
             page_size=200,
         )
@@ -2312,14 +2206,12 @@ async def get_claimable_rate_all_netuids(
         self,
         hotkey_ss58: str,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> dict[int, float]:
         """Retrieves all root claimable rates from a given hotkey address for all subnets with this validator.
 
         Args:
             hotkey_ss58: The SS58 address of the root validator.
             block_hash: The blockchain block hash for the query.
-            reuse_block: Whether to reuse the last-used blockchain block hash.
 
         Returns:
             dict[int, float]: Dictionary mapping netuid to claimable rate.
@@ -2329,7 +2221,6 @@ async def get_claimable_rate_all_netuids(
             storage_function="RootClaimable",
             params=[hotkey_ss58],
             block_hash=block_hash,
-            reuse_block_hash=reuse_block,
         )
 
         if not query:
@@ -2343,7 +2234,6 @@ async def get_claimable_rate_netuid(
         hotkey_ss58: str,
         netuid: int,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> float:
         """Retrieves the root claimable rate from a given hotkey address for provided netuid.
 
@@ -2351,7 +2241,6 @@ async def get_claimable_rate_netuid(
             hotkey_ss58: The SS58 address of the root validator.
             netuid: The unique identifier of the subnet to get the rate.
             block_hash: The blockchain block hash for the query.
-            reuse_block: Whether to reuse the last-used blockchain block hash.
 
         Returns:
             float: The rate of claimable stake from validator's hotkey for provided subnet.
@@ -2359,7 +2248,6 @@ async def get_claimable_rate_netuid(
         all_rates = await self.get_claimable_rate_all_netuids(
             hotkey_ss58=hotkey_ss58,
             block_hash=block_hash,
-            reuse_block=reuse_block,
         )
         return all_rates.get(netuid, 0.0)
 
@@ -2369,7 +2257,6 @@ async def get_claimable_stake_for_netuid(
         hotkey_ss58: str,
         netuid: int,
         block_hash: Optional[str] = None,
-        reuse_block: bool = False,
     ) -> Balance:
         """Retrieves the root claimable stake for a given coldkey address.
 
@@ -2378,7 +2265,6 @@ async def get_claimable_stake_for_netuid(
             hotkey_ss58: The root validator hotkey SS58 address.
             netuid: Delegate's netuid where stake will be claimed.
             block_hash: The blockchain block hash for the query.
-            reuse_block: Whether to reuse the last-used blockchain block hash.
 
         Returns:
             Balance: Available for claiming root stake.
@@ -2397,14 +2283,12 @@ async def get_claimable_stake_for_netuid(
                 hotkey_ss58=hotkey_ss58,
                 netuid=netuid,
                 block_hash=block_hash,
-                reuse_block=reuse_block,
             ),
             self.get_claimed_amount(
                 coldkey_ss58=coldkey_ss58,
                 hotkey_ss58=hotkey_ss58,
                 netuid=netuid,
                 block_hash=block_hash,
-                reuse_block=reuse_block,
             ),
         )
 
diff --git a/bittensor_cli/src/commands/stake/auto_staking.py b/bittensor_cli/src/commands/stake/auto_staking.py
index 39896294f..86d3bc4d4 100644
--- a/bittensor_cli/src/commands/stake/auto_staking.py
+++ b/bittensor_cli/src/commands/stake/auto_staking.py
@@ -52,7 +52,6 @@ async def show_auto_stake_destinations(
             subtensor.get_auto_stake_destinations(
                 coldkey_ss58=coldkey_ss58,
                 block_hash=chain_head,
-                reuse_block=True,
             ),
             subtensor.fetch_coldkey_hotkey_identities(block_hash=chain_head),
         )
diff --git a/bittensor_cli/src/commands/sudo.py b/bittensor_cli/src/commands/sudo.py
index 6137ce29a..7bb3da769 100644
--- a/bittensor_cli/src/commands/sudo.py
+++ b/bittensor_cli/src/commands/sudo.py
@@ -1376,7 +1376,7 @@ async def senate_vote(
         return False
 
     console.print(f"Fetching proposals in [dark_orange]network: {subtensor.network}")
-    vote_data = await subtensor.get_vote_data(proposal_hash, reuse_block=True)
+    vote_data = await subtensor.get_vote_data(proposal_hash)
     if not vote_data:
         print_error("Failed: Proposal not found.")
         return False
diff --git a/bittensor_cli/src/commands/wallets.py b/bittensor_cli/src/commands/wallets.py
index 5c16b9733..ea5a539cb 100644
--- a/bittensor_cli/src/commands/wallets.py
+++ b/bittensor_cli/src/commands/wallets.py
@@ -1055,7 +1055,7 @@ async def overview(
         neurons: dict[str, list[NeuronInfoLite]] = {}
 
         netuids = await subtensor.filter_netuids_by_registered_hotkeys(
-            all_netuids, netuids_filter, all_hotkeys, reuse_block=True
+            all_netuids, netuids_filter, all_hotkeys
         )
 
         for netuid in netuids:
diff --git a/bittensor_cli/src/commands/weights.py b/bittensor_cli/src/commands/weights.py
index 3fa0135c3..c453255d5 100644
--- a/bittensor_cli/src/commands/weights.py
+++ b/bittensor_cli/src/commands/weights.py
@@ -97,7 +97,6 @@ async def set_weights_extrinsic(self) -> tuple[bool, str, Optional[str]]:
             await self.subtensor.get_hyperparameter(
                 param_name="get_commit_reveal_weights_enabled",
                 netuid=self.netuid,
-                reuse_block=False,
             )
         ):
             return await self._commit_reveal(
@@ -162,7 +161,6 @@ async def _commit_reveal(
             await self.subtensor.get_hyperparameter(
                 param_name="get_commit_reveal_period",
                 netuid=self.netuid,
-                reuse_block=False,
             )
         )
 

From d17ef4992040a72ea579147468e3807c5382d4ff Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Tue, 14 Apr 2026 12:26:09 +0200
Subject: [PATCH 19/30] Import cleanup and added TODOs

---
 bittensor_cli/__init__.py                      |  2 +-
 bittensor_cli/src/bittensor/chain_data.py      |  5 ++---
 .../src/bittensor/extrinsics/registration.py   |  1 -
 .../src/bittensor/extrinsics/transfer.py       |  1 -
 bittensor_cli/src/bittensor/utils.py           | 18 ------------------
 .../src/commands/stake/children_hotkeys.py     |  1 -
 bittensor_cli/src/commands/stake/list.py       |  3 ++-
 bittensor_cli/src/commands/stake/move.py       |  1 -
 bittensor_cli/src/commands/stake/remove.py     |  1 -
 9 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/bittensor_cli/__init__.py b/bittensor_cli/__init__.py
index 656f68a42..c3f0e0102 100644
--- a/bittensor_cli/__init__.py
+++ b/bittensor_cli/__init__.py
@@ -19,4 +19,4 @@
 from .version import __version__, __version_as_int__
 
 
-__all__ = ["CLIManager"]
+__all__ = ["CLIManager", "__version__", "__version_as_int__"]
diff --git a/bittensor_cli/src/bittensor/chain_data.py b/bittensor_cli/src/bittensor/chain_data.py
index 7fd1e2049..6f18cc919 100644
--- a/bittensor_cli/src/bittensor/chain_data.py
+++ b/bittensor_cli/src/bittensor/chain_data.py
@@ -1,8 +1,7 @@
 from abc import abstractmethod
 from dataclasses import dataclass
-from collections.abc import Sequence
 from enum import Enum
-from typing import Optional, Any, Union, Callable, Hashable
+from typing import Optional, Any, Union
 
 import netaddr
 from scalecodec.utils.ss58 import ss58_encode
@@ -780,7 +779,7 @@ def tao_to_alpha_with_slippage(
         if self.is_dynamic:
             new_tao_in = self.tao_in + tao
             if new_tao_in == 0:
-                return tao, Balance.from_rao(0)
+                return tao, Balance.from_rao(0), 0.0
             new_alpha_in = self.k / new_tao_in
 
             # Amount of alpha given to the staker
diff --git a/bittensor_cli/src/bittensor/extrinsics/registration.py b/bittensor_cli/src/bittensor/extrinsics/registration.py
index e4cc4d183..0193d6702 100644
--- a/bittensor_cli/src/bittensor/extrinsics/registration.py
+++ b/bittensor_cli/src/bittensor/extrinsics/registration.py
@@ -38,7 +38,6 @@
     millify,
     get_human_readable,
     print_verbose,
-    print_error,
     unlock_key,
     hex_to_bytes,
     get_hotkey_pub_ss58,
diff --git a/bittensor_cli/src/bittensor/extrinsics/transfer.py b/bittensor_cli/src/bittensor/extrinsics/transfer.py
index 2d2369475..383d1f74f 100644
--- a/bittensor_cli/src/bittensor/extrinsics/transfer.py
+++ b/bittensor_cli/src/bittensor/extrinsics/transfer.py
@@ -15,7 +15,6 @@
     print_success,
     print_verbose,
     is_valid_bittensor_address_or_public_key,
-    print_error,
     unlock_key,
 )
 
diff --git a/bittensor_cli/src/bittensor/utils.py b/bittensor_cli/src/bittensor/utils.py
index d0a54b115..7cd17abbb 100644
--- a/bittensor_cli/src/bittensor/utils.py
+++ b/bittensor_cli/src/bittensor/utils.py
@@ -27,7 +27,6 @@
 from rich.prompt import Confirm, Prompt
 from rich.table import Table
 from scalecodec import GenericCall
-from scalecodec.utils.ss58 import ss58_encode, ss58_decode
 import typer
 
 
@@ -633,23 +632,6 @@ def is_valid_bittensor_address_or_public_key(address: Union[str, bytes]) -> bool
         return False
 
 
-def encode_account_id(ss58_address: str) -> bytes:
-    return bytes.fromhex(ss58_decode(ss58_address, SS58_FORMAT))
-
-
-def ss58_to_vec_u8(ss58_address: str) -> list[int]:
-    """
-    Converts an SS58 address to a list of integers (vector of u8).
-
-    :param ss58_address: The SS58 address to be converted.
-
-    :return: A list of integers representing the byte values of the SS58 address.
-    """
-    ss58_bytes: bytes = encode_account_id(ss58_address)
-    encoded_address: list[int] = [int(byte) for byte in ss58_bytes]
-    return encoded_address
-
-
 def get_explorer_root_url_by_network_from_map(
     network: str, network_map: dict[str, dict[str, str]]
 ) -> dict[str, str]:
diff --git a/bittensor_cli/src/commands/stake/children_hotkeys.py b/bittensor_cli/src/commands/stake/children_hotkeys.py
index 1bf036aff..11115cf39 100644
--- a/bittensor_cli/src/commands/stake/children_hotkeys.py
+++ b/bittensor_cli/src/commands/stake/children_hotkeys.py
@@ -26,7 +26,6 @@
     json_console,
     get_hotkey_pub_ss58,
     print_extrinsic_id,
-    err_console,
 )
 
 
diff --git a/bittensor_cli/src/commands/stake/list.py b/bittensor_cli/src/commands/stake/list.py
index 61fc611e2..92cd6f5bb 100644
--- a/bittensor_cli/src/commands/stake/list.py
+++ b/bittensor_cli/src/commands/stake/list.py
@@ -194,6 +194,7 @@ def create_table(
             tao_value_ = pool.alpha_to_tao(substake_.stake)
             total_swapped_tao_value_ += tao_value_
 
+            # TODO why is nothing done with `swap_value`?
             if netuid == 0:
                 swap_value = f"[{COLOR_PALETTE['STAKE']['NOT_REGISTERED']}]N/A[/{COLOR_PALETTE['STAKE']['NOT_REGISTERED']}]"
             else:
@@ -396,7 +397,7 @@ def format_cell(
                 precision=4,
                 millify=True if not verbose else False,
             )
-
+            # TODO why is nothing done with swap_cell
             if netuid != 0:
                 swap_cell = format_cell(
                     swapped_tao_value_.tao,
diff --git a/bittensor_cli/src/commands/stake/move.py b/bittensor_cli/src/commands/stake/move.py
index f618641f7..74bf5bbf1 100644
--- a/bittensor_cli/src/commands/stake/move.py
+++ b/bittensor_cli/src/commands/stake/move.py
@@ -15,7 +15,6 @@
     confirm_action,
     console,
     create_table,
-    is_valid_ss58_address,
     print_error,
     group_subnets,
     get_subnet_name,
diff --git a/bittensor_cli/src/commands/stake/remove.py b/bittensor_cli/src/commands/stake/remove.py
index 555974504..7cd9b1d0f 100644
--- a/bittensor_cli/src/commands/stake/remove.py
+++ b/bittensor_cli/src/commands/stake/remove.py
@@ -23,7 +23,6 @@
     print_error,
     get_hotkey_wallets_for_wallet,
     is_valid_ss58_address,
-    format_error_message,
     group_subnets,
     unlock_key,
     json_console,

From 08a01866e6cc0c78eb0f34922afe99415a4a4a2f Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Tue, 14 Apr 2026 13:14:17 +0200
Subject: [PATCH 20/30] Import cleanup

---
 .github/workflows/ruff-formatter.yml              | 4 ++--
 tests/unit_tests/test_proxy_address_resolution.py | 1 -
 tests/unit_tests/test_transfer_extrinsic.py       | 1 -
 tests/unit_tests/test_unstake_helpers.py          | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ruff-formatter.yml b/.github/workflows/ruff-formatter.yml
index b8e5fbd32..6bc5c582d 100644
--- a/.github/workflows/ruff-formatter.yml
+++ b/.github/workflows/ruff-formatter.yml
@@ -9,7 +9,7 @@ permissions:
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [ opened, synchronize, reopened ]
 
 jobs:
   ruff:
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Ruff format check
-        uses: astral-sh/ruff-action@v3
+        uses: astral-sh/ruff-action@v4.0.0
         with:
           version: "0.11.5"
           args: "format --diff"
diff --git a/tests/unit_tests/test_proxy_address_resolution.py b/tests/unit_tests/test_proxy_address_resolution.py
index 5ca7e97a2..a96bf632d 100644
--- a/tests/unit_tests/test_proxy_address_resolution.py
+++ b/tests/unit_tests/test_proxy_address_resolution.py
@@ -8,7 +8,6 @@
 from contextlib import contextmanager
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from bittensor_cli.src.bittensor.balances import Balance
 from tests.unit_tests.conftest import (
     PROXY_SS58,
     HOTKEY_SS58,
diff --git a/tests/unit_tests/test_transfer_extrinsic.py b/tests/unit_tests/test_transfer_extrinsic.py
index 93c09fdf4..d82e4c95d 100644
--- a/tests/unit_tests/test_transfer_extrinsic.py
+++ b/tests/unit_tests/test_transfer_extrinsic.py
@@ -5,7 +5,6 @@
 and mock_subtensor fixtures from conftest.py.
 """
 
-import pytest
 from unittest.mock import AsyncMock, MagicMock, patch
 
 from bittensor_cli.src.bittensor.balances import Balance
diff --git a/tests/unit_tests/test_unstake_helpers.py b/tests/unit_tests/test_unstake_helpers.py
index 81f0fc5f2..1240c7044 100644
--- a/tests/unit_tests/test_unstake_helpers.py
+++ b/tests/unit_tests/test_unstake_helpers.py
@@ -9,7 +9,6 @@
   - _print_table_and_slippage
 """
 
-import pytest
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 

From 697e7c708c6b3bdedd6647834ca14637d769330b Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Tue, 14 Apr 2026 13:14:55 +0200
Subject: [PATCH 21/30] Add TODO

---
 pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index e9f2f190a..08f20c63f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ version = "9.20.1"
 description = "Bittensor CLI"
 readme = "README.md"
 authors = [
-    {name = "bittensor.com"}
+    { name = "bittensor.com" }
 ]
 license = "MIT"
 scripts = { btcli = "bittensor_cli.cli:main" }
@@ -29,6 +29,7 @@ classifiers = [
 ]
 dependencies = [
     "wheel",
+    # TODO this will need to be changed to asi 2.0-3.0 when merged
     "async-substrate-interface @ git+https://github.com/opentensor/async-substrate-interface.git@release/2.0.0",
     "aiohttp~=3.13",
     "backoff~=2.2.1",

From 171b00497e5c19082326d110f49b839490732c2b Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Tue, 14 Apr 2026 16:47:36 +0200
Subject: [PATCH 22/30] Debugging

---
 bittensor_cli/src/bittensor/utils.py     | 43 +++++-------------------
 tests/e2e_tests/test_children_hotkeys.py |  6 +++-
 tests/unit_tests/test_utils.py           | 12 +++----
 3 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/bittensor_cli/src/bittensor/utils.py b/bittensor_cli/src/bittensor/utils.py
index 7cd17abbb..06340568f 100644
--- a/bittensor_cli/src/bittensor/utils.py
+++ b/bittensor_cli/src/bittensor/utils.py
@@ -799,48 +799,21 @@ def decode_hex_identity_dict(info_dictionary) -> dict[str, Any]:
     Examples:
         input_dict = {
              "name": {"value": "0x6a6f686e"},
-             "additional": [
-                 {"data1": "0x64617461"},
-                 ("data2", "0x64617461")
-             ]
+             "additional": "0x64617461"
          }
         decode_hex_identity_dict(input_dict)
-        {'name': 'john', 'additional': [('data1', 'data'), ('data2', 'data')]}
+        {'name': 'john', 'additional': "data"]}
     """
 
-    def get_decoded(data: Optional[str]) -> str:
-        """Decodes a hex-encoded string."""
-        if data is None:
-            return ""
-        try:
-            return hex_to_bytes(data).decode()
-        except (UnicodeDecodeError, ValueError):
-            print_error(f"Could not decode: {key}: {item}")
-            raise ValueError
-
     for key, value in info_dictionary.items():
         if isinstance(value, dict):
             item = list(value.values())[0]
-            if isinstance(item, str) and item.startswith("0x"):
-                try:
-                    info_dictionary[key] = get_decoded(item)
-                except UnicodeDecodeError:
-                    print_error(f"Could not decode: {key}: {item}")
-            else:
-                info_dictionary[key] = item
-        if key == "additional":
-            additional = []
-            for item in value:
-                if isinstance(item, dict):
-                    for k, v in item.items():
-                        additional.append((k, get_decoded(v)))
-                else:
-                    if isinstance(item, (tuple, list)) and len(item) == 2:
-                        k_, v = item
-                        k = k_ if k_ is not None else ""
-                        additional.append((k, get_decoded(v)))
-            info_dictionary[key] = additional
-
+        else:
+            item = value
+        if isinstance(item, str) and item.startswith("0x"):
+            info_dictionary[key] = hex_to_bytes(item.removeprefix("0x")).decode()
+        else:
+            info_dictionary[key] = item
     return info_dictionary
 
 
diff --git a/tests/e2e_tests/test_children_hotkeys.py b/tests/e2e_tests/test_children_hotkeys.py
index 2b1d80681..80a4b2f64 100644
--- a/tests/e2e_tests/test_children_hotkeys.py
+++ b/tests/e2e_tests/test_children_hotkeys.py
@@ -215,7 +215,11 @@ def test_children_hotkeys(local_chain, wallet_setup):
             "--json-output",
         ],
     )
-    set_take_result_json = json.loads(set_take_result.stdout)
+    try:
+        set_take_result_json = json.loads(set_take_result.stdout)
+    except json.decoder.JSONDecodeError:
+        print(set_take_result.stdout, set_take_result.stderr)
+        raise Exception
     assert set_take_result_json[str(netuid)]["success"] is True, (
         f"Take not set:\n{set_take_result.stdout}\n{set_take_result.stderr}"
     )
diff --git a/tests/unit_tests/test_utils.py b/tests/unit_tests/test_utils.py
index 6a3774d0f..636fde981 100644
--- a/tests/unit_tests/test_utils.py
+++ b/tests/unit_tests/test_utils.py
@@ -14,20 +14,20 @@
         (
             {
                 "name": {"value": "0x6a6f686e"},
-                "additional": [{"data1": "0x64617461"}, ("data2", "0x64617461")],
+                "additional": "0x64617461",
             },
-            {"name": "john", "additional": [("data1", "data"), ("data2", "data")]},
+            {"name": "john", "additional": "data"},
         ),
         (
-            {"name": {"value": "0x6a6f686e"}, "additional": [("data2", "0x64617461")]},
-            {"name": "john", "additional": [("data2", "data")]},
+            {"name": {"value": "0x6a6f686e"}, "additional": "0x64617461"},
+            {"name": "john", "additional": "data"},
         ),
         (
             {
                 "name": {"value": "0x6a6f686e"},
-                "additional": [(None, None)],
+                "additional": None,
             },
-            {"name": "john", "additional": [("", "")]},
+            {"name": "john", "additional": None},
         ),
     ],
 )

From 82fdb23462a759751164afffe350e1b3f7848840 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Tue, 14 Apr 2026 16:57:52 +0200
Subject: [PATCH 23/30] Bump cyscale

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 08f20c63f..e3d067792 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,7 +41,7 @@ dependencies = [
     "pycryptodome>=3.0.0,<4.0.0",
     "PyYAML~=6.0",
     "rich>=13.7,<15.0",
-    "cyscale==0.1.11",
+    "cyscale==0.2.0",
     "typer>=0.16",
     "typing_extensions>4.0.0; python_version<'3.11'",
     "bittensor-wallet==4.0.1",

From dce83ba4132b943a496fc29d3e939523ef5726ad Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Thu, 16 Apr 2026 17:40:04 +0200
Subject: [PATCH 24/30] Bump cyscale

---
 pyproject.toml                            | 2 +-
 tests/unit_tests/test_subnets_register.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index e3d067792..d39d3c84a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,7 +41,7 @@ dependencies = [
     "pycryptodome>=3.0.0,<4.0.0",
     "PyYAML~=6.0",
     "rich>=13.7,<15.0",
-    "cyscale==0.2.0",
+    "cyscale==0.2.2",
     "typer>=0.16",
     "typing_extensions>4.0.0; python_version<'3.11'",
     "bittensor-wallet==4.0.1",
diff --git a/tests/unit_tests/test_subnets_register.py b/tests/unit_tests/test_subnets_register.py
index b766d8739..45355f1fc 100644
--- a/tests/unit_tests/test_subnets_register.py
+++ b/tests/unit_tests/test_subnets_register.py
@@ -2,7 +2,6 @@
 Unit tests for subnets register command.
 """
 
-from asyncio import Future
 
 import pytest
 from unittest.mock import AsyncMock, patch

From 0dbf9721c7e88cf75bfc4bdf476c3976f5dd688b Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Thu, 16 Apr 2026 19:30:35 +0200
Subject: [PATCH 25/30] Clean up logic

---
 .../src/bittensor/subtensor_interface.py      | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index 04c750415..9f9efa5dd 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -13,7 +13,7 @@
 from bittensor_wallet import Wallet
 from bittensor_wallet.bittensor_wallet import Keypair
 from bittensor_wallet.utils import SS58_FORMAT
-from scalecodec import GenericCall, ScaleBytes
+from scalecodec import GenericCall, ScaleBytes, ScaleValue
 import typer
 import websockets
 
@@ -144,9 +144,9 @@ async def query(
         block_hash: Optional[str] = None,
         raw_storage_key: Optional[bytes] = None,
         subscription_handler=None,
-    ) -> Any:
+    ) -> ScaleValue:
         """
-        Pass-through to substrate.query which automatically returns the .value if it's a ScaleType
+        Pass-through to substrate.query which automatically returns the .value
         """
         result: Optional[ScaleType] = await self.substrate.query(
             module,
@@ -156,7 +156,7 @@ async def query(
             raw_storage_key,
             subscription_handler,
         )
-        return getattr(result, "value", result)
+        return result.value
 
     async def _decode_inline_call(
         self,
@@ -308,7 +308,7 @@ async def query_runtime_api(
         method: str,
         params: Optional[Union[list, dict]] = None,
         block_hash: Optional[str] = None,
-    ) -> Optional[Any]:
+    ) -> ScaleValue:
         """
         Queries the runtime API of the Bittensor blockchain, providing a way to interact with the underlying
         runtime and retrieve data encoded in Scale Bytes format. This function is essential for advanced users
@@ -2059,7 +2059,7 @@ async def get_coldkey_claim_type(
                 - {"type": "Keep"}
                 - {"type": "KeepSubnets", "subnets": [1, 5, 10, ...]}
         """
-        result = await self.query(
+        result: Optional[str | dict] = await self.query(
             module="SubtensorModule",
             storage_function="RootClaimType",
             params=[coldkey_ss58],
@@ -2069,14 +2069,13 @@ async def get_coldkey_claim_type(
         if result is None:
             return {"type": "Swap"}
 
-        claim_type_key = next(iter(result.keys()))
-
-        if claim_type_key == "KeepSubnets":
-            subnets_data = result["KeepSubnets"]["subnets"]
-            subnet_list = sorted([subnet for subnet in subnets_data[0]])
-            return {"type": "KeepSubnets", "subnets": subnet_list}
+        if isinstance(result, str):
+            return {"type": result}
         else:
-            return {"type": claim_type_key}
+            claim_type = next(iter(result.keys()))
+            subnets_data = result[claim_type]["subnets"]
+            subnet_list = sorted(subnets_data)
+            return {"type": claim_type, "subnets": subnet_list}
 
     async def get_all_coldkeys_claim_type(
         self,
@@ -2504,7 +2503,7 @@ async def get_subnet_ema_tao_inflow(
         Returns:
             Balance(EMA TAO inflow).
         """
-        value = await self.substrate.query(
+        value = await self.query(
             module="SubtensorModule",
             storage_function="SubnetEmaTaoFlow",
             params=[netuid],

From 20e1f3f19e4620702576dfcebda84a0d14cb6436 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Thu, 16 Apr 2026 19:33:01 +0200
Subject: [PATCH 26/30] Clean up

---
 bittensor_cli/src/bittensor/subtensor_interface.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bittensor_cli/src/bittensor/subtensor_interface.py b/bittensor_cli/src/bittensor/subtensor_interface.py
index 9f9efa5dd..3d6545af9 100644
--- a/bittensor_cli/src/bittensor/subtensor_interface.py
+++ b/bittensor_cli/src/bittensor/subtensor_interface.py
@@ -2114,7 +2114,7 @@ async def get_all_coldkeys_claim_type(
                 claim_type_dict = claim_type_data
             if claim_type_key == "KeepSubnets":
                 subnets_data = claim_type_dict["KeepSubnets"]["subnets"]
-                subnet_list = sorted([subnet for subnet in subnets_data[0]])
+                subnet_list = sorted([subnet for subnet in subnets_data])
                 root_claim_types[coldkey_ss58] = {
                     "type": "KeepSubnets",
                     "subnets": subnet_list,

From 737033395a3750c49d9a7bff39637a0e01f52de8 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Thu, 16 Apr 2026 20:09:35 +0200
Subject: [PATCH 27/30] Debug

---
 bittensor_cli/cli.py                     | 1 -
 tests/e2e_tests/test_children_hotkeys.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/bittensor_cli/cli.py b/bittensor_cli/cli.py
index b2dc910f9..040afef53 100755
--- a/bittensor_cli/cli.py
+++ b/bittensor_cli/cli.py
@@ -7740,7 +7740,6 @@ def subnets_show(
             selected_mechanism_id = self.ask_subnet_mechanism(
                 mechanism_id, mechanism_count, netuid
             )
-
         return self._run_command(
             subnets.show(
                 subtensor=subtensor,
diff --git a/tests/e2e_tests/test_children_hotkeys.py b/tests/e2e_tests/test_children_hotkeys.py
index 80a4b2f64..c7f3f2982 100644
--- a/tests/e2e_tests/test_children_hotkeys.py
+++ b/tests/e2e_tests/test_children_hotkeys.py
@@ -218,7 +218,7 @@ def test_children_hotkeys(local_chain, wallet_setup):
     try:
         set_take_result_json = json.loads(set_take_result.stdout)
     except json.decoder.JSONDecodeError:
-        print(set_take_result.stdout, set_take_result.stderr)
+        print("DEBUG221", set_take_result.stdout, set_take_result.stderr)
         raise Exception
     assert set_take_result_json[str(netuid)]["success"] is True, (
         f"Take not set:\n{set_take_result.stdout}\n{set_take_result.stderr}"

From 1bace1e24ae6c7c5023ef0bff8ad0f3d569b4e18 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Thu, 16 Apr 2026 20:11:22 +0200
Subject: [PATCH 28/30] Ruff

---
 tests/unit_tests/test_subnets_register.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit_tests/test_subnets_register.py b/tests/unit_tests/test_subnets_register.py
index 45355f1fc..6019be767 100644
--- a/tests/unit_tests/test_subnets_register.py
+++ b/tests/unit_tests/test_subnets_register.py
@@ -2,7 +2,6 @@
 Unit tests for subnets register command.
 """
 
-
 import pytest
 from unittest.mock import AsyncMock, patch
 

From 78e5d4536f723a280a51c2a4611f835f9260cf74 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Thu, 16 Apr 2026 20:23:40 +0200
Subject: [PATCH 29/30] Test fix

---
 bittensor_cli/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bittensor_cli/cli.py b/bittensor_cli/cli.py
index 040afef53..cc228f159 100755
--- a/bittensor_cli/cli.py
+++ b/bittensor_cli/cli.py
@@ -6563,7 +6563,7 @@ def stake_childkey_take(
             wallet_name,
             wallet_path,
             wallet_hotkey,
-            ask_for=[WO.NAME, WO.HOTKEY],
+            ask_for=[WO.NAME],
             validate=WV.WALLET_AND_HOTKEY,
         )
         if all_netuids and netuid:

From 628e7e30afe75a16b82e6a83e41122a43f5af9d3 Mon Sep 17 00:00:00 2001
From: BD Himes <b@latent.to>
Date: Thu, 16 Apr 2026 20:37:28 +0200
Subject: [PATCH 30/30] Bug fix

---
 bittensor_cli/src/bittensor/balances.py          | 16 ++--------------
 .../src/commands/liquidity/liquidity.py          | 15 ++++++---------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/bittensor_cli/src/bittensor/balances.py b/bittensor_cli/src/bittensor/balances.py
index 34711f46b..9ec33e2df 100644
--- a/bittensor_cli/src/bittensor/balances.py
+++ b/bittensor_cli/src/bittensor/balances.py
@@ -19,6 +19,7 @@
 
 from typing import Union
 from bittensor_cli.src import UNITS
+from scalecodec.utils.math import fixed_to_float
 
 
 class Balance:
@@ -297,17 +298,4 @@ def set_unit(self, netuid: int):
         return self
 
 
-def fixed_to_float(fixed, frac_bits: int = 64, total_bits: int = 128) -> float:
-    # By default, this is a U64F64
-    # which is 64 bits of integer and 64 bits of fractional
-
-    data: int = fixed["bits"]
-
-    # Logical and to get the fractional part; remaining is the integer part
-    fractional_part = data & (2**frac_bits - 1)
-    # Shift to get the integer part from the remaining bits
-    integer_part = data >> (total_bits - frac_bits)
-
-    frac_float = fractional_part / (2**frac_bits)
-
-    return integer_part + frac_float
+__all__ = ["Balance", "UNITS", "fixed_to_float"]
diff --git a/bittensor_cli/src/commands/liquidity/liquidity.py b/bittensor_cli/src/commands/liquidity/liquidity.py
index 7997afc5f..32a3844ca 100644
--- a/bittensor_cli/src/commands/liquidity/liquidity.py
+++ b/bittensor_cli/src/commands/liquidity/liquidity.py
@@ -378,10 +378,9 @@ async def get_liquidity_list(
     preprocessed_positions = []
     positions_futures = []
 
-    async for _, p in positions_response:
-        position = p.value
-        tick_index_low = position.get("tick_low")[0]
-        tick_index_high = position.get("tick_high")[0]
+    async for _, position in positions_response:
+        tick_index_low = position.get("tick_low")
+        tick_index_high = position.get("tick_high")
         preprocessed_positions.append((position, tick_index_low, tick_index_high))
 
         # Get ticks for the position (for below/above fees)
@@ -460,12 +459,10 @@ async def get_liquidity_list(
 
         lp = LiquidityPosition(
             **{
-                "id": position.get("id")[0],
-                "price_low": Balance.from_tao(
-                    tick_to_price(position.get("tick_low")[0])
-                ),
+                "id": position.get("id"),
+                "price_low": Balance.from_tao(tick_to_price(position.get("tick_low"))),
                 "price_high": Balance.from_tao(
-                    tick_to_price(position.get("tick_high")[0])
+                    tick_to_price(position.get("tick_high"))
                 ),
                 "liquidity": Balance.from_rao(position.get("liquidity")),
                 "fees_tao": fees_tao,