bittensor-cli 9.0.0rc2__py3-none-any.whl → 9.0.0rc4__py3-none-any.whl

bittensor_cli/src/commands/subnets/subnets.py

@@ -326,7 +326,7 @@ async def subnets_list(
             if netuid == 0:
                 emission_tao = 0.0
             else:
-                emission_tao = subnet.emission.tao
+                emission_tao = subnet.tao_in_emission.tao
 
             alpha_in_value = (
                 f"{millify_tao(subnet.alpha_in.tao)}"
@@ -399,7 +399,7 @@ async def subnets_list(
             )
 
         total_emissions = round(
-            sum(float(subnet.emission.tao) for subnet in subnets if subnet.netuid != 0),
+            sum(subnet.tao_in_emission.tao for subnet in subnets if subnet.netuid != 0),
             4,
         )
         total_rate = round(
@@ -528,7 +528,7 @@ async def subnets_list(
             if netuid == 0:
                 emission_tao = 0.0
             else:
-                emission_tao = subnet.emission.tao
+                emission_tao = subnet.tao_in_emission.tao
 
             market_cap = (subnet.alpha_in.tao + subnet.alpha_out.tao) * subnet.price.tao
             supply = subnet.alpha_in.tao + subnet.alpha_out.tao
@@ -657,7 +657,7 @@ async def subnets_list(
         # Calculate totals
         total_netuids = len(subnets)
         _total_emissions = sum(
-            float(subnet.emission.tao) for subnet in subnets if subnet.netuid != 0
+            subnet.tao_in_emission.tao for subnet in subnets if subnet.netuid != 0
         )
         total_emissions = (
             f"{millify_tao(_total_emissions)}"
@@ -665,9 +665,7 @@ async def subnets_list(
             else f"{_total_emissions:,.2f}"
         )
 
-        total_rate = sum(
-            float(subnet.price.tao) for subnet in subnets if subnet.netuid != 0
-        )
+        total_rate = sum(subnet.price.tao for subnet in subnets if subnet.netuid != 0)
         total_rate = (
             f"{millify_tao(total_rate)}" if not verbose else f"{total_rate:,.2f}"
         )
@@ -804,6 +802,7 @@ async def subnets_list(
 async def show(
     subtensor: "SubtensorInterface",
     netuid: int,
+    sort: bool = False,
     max_rows: Optional[int] = None,
     delegate_selection: bool = False,
     verbose: bool = False,
@@ -850,18 +849,6 @@ async def show(
         )
 
         table.add_column("[bold white]Position", style="white", justify="center")
-        # table.add_column(
-        #     f"[bold white]Total Stake ({Balance.get_unit(0)})",
-        #     style=COLOR_PALETTE["POOLS"]["ALPHA_IN"],
-        #     justify="center",
-        # )
-        # ------- Temporary columns for testing -------
-        # table.add_column(
-        #     "Alpha (τ)",
-        #     style=COLOR_PALETTE["POOLS"]["EXTRA_2"],
-        #     no_wrap=True,
-        #     justify="right",
-        # )
         table.add_column(
             "Tao (τ)",
             style=COLOR_PALETTE["POOLS"]["EXTRA_2"],
@@ -869,7 +856,6 @@ async def show(
             justify="right",
             footer=f"{tao_sum:.4f} τ" if verbose else f"{millify_tao(tao_sum)} τ",
         )
-        # ------- End Temporary columns for testing -------
         table.add_column(
             f"[bold white]Emission ({Balance.get_unit(0)}/block)",
             style=COLOR_PALETTE["POOLS"]["EMISSION"],
@@ -1075,14 +1061,6 @@ async def show(
             pad_edge=True,
         )
 
-        # For hotkey_block_emission calculation
-        emission_sum = sum(
-            [
-                subnet_state.emission[idx].tao
-                for idx in range(len(subnet_state.emission))
-            ]
-        )
-
         # For table footers
         alpha_sum = sum(
             [
@@ -1102,7 +1080,16 @@ async def show(
                 for idx in range(len(subnet_state.tao_stake))
             ]
         )
-        relative_emissions_sum = 0
+        dividends_sum = sum(
+            subnet_state.dividends[idx] for idx in range(len(subnet_state.dividends))
+        )
+        emission_sum = sum(
+            [
+                subnet_state.emission[idx].tao
+                for idx in range(len(subnet_state.emission))
+            ]
+        )
+
         owner_hotkeys = await subtensor.get_owned_hotkeys(subnet_info.owner_coldkey)
         if subnet_info.owner_hotkey not in owner_hotkeys:
             owner_hotkeys.append(subnet_info.owner_hotkey)
@@ -1118,25 +1105,24 @@ async def show(
         sorted_indices = sorted(
             range(len(subnet_state.hotkeys)),
             key=lambda i: (
-                # Sort by owner status first
-                not (
-                    subnet_state.coldkeys[i] == subnet_info.owner_coldkey
-                    or subnet_state.hotkeys[i] in owner_hotkeys
-                ),
-                # Then sort by stake amount (higher stakes first)
-                -subnet_state.total_stake[i].tao,
+                # If sort is True, sort only by UIDs
+                i
+                if sort
+                else (
+                    # Otherwise
+                    # Sort by owner status first
+                    not (
+                        subnet_state.coldkeys[i] == subnet_info.owner_coldkey
+                        or subnet_state.hotkeys[i] in owner_hotkeys
+                    ),
+                    # Then sort by stake amount (higher stakes first)
+                    -subnet_state.total_stake[i].tao,
+                )
             ),
         )
 
         rows = []
         for idx in sorted_indices:
-            hotkey_block_emission = (
-                subnet_state.emission[idx].tao / emission_sum
-                if emission_sum != 0
-                else 0
-            )
-            relative_emissions_sum += hotkey_block_emission
-
             # Get identity for this uid
             coldkey_identity = identities.get(subnet_state.coldkeys[idx], {}).get(
                 "name", ""
@@ -1175,11 +1161,9 @@ async def show(
                     f"τ {tao_stake.tao:.4f}"
                     if verbose
                     else f"τ {millify_tao(tao_stake)}",  # Tao Stake
-                    # str(subnet_state.dividends[idx]),
-                    f"{Balance.from_tao(hotkey_block_emission).set_unit(netuid_).tao:.5f}",  # Dividends
-                    f"{subnet_state.incentives[idx]:.4f}",  # Incentive
-                    # f"{Balance.from_tao(hotkey_block_emission).set_unit(netuid_).tao:.5f}",  # Emissions relative
-                    f"{Balance.from_tao(subnet_state.emission[idx].tao).set_unit(netuid_).tao:.5f} {subnet_info.symbol}",  # Emissions
+                    f"{subnet_state.dividends[idx]:.6f}",  # Dividends
+                    f"{subnet_state.incentives[idx]:.6f}",  # Incentive
+                    f"{Balance.from_tao(subnet_state.emission[idx].tao).set_unit(netuid_).tao:.6f} {subnet_info.symbol}",  # Emissions
                     f"{subnet_state.hotkeys[idx][:6]}"
                     if not verbose
                     else f"{subnet_state.hotkeys[idx]}",  # Hotkey
@@ -1201,7 +1185,6 @@ async def show(
             if verbose
             else f"{millify_tao(stake_sum)} {subnet_info.symbol}",
         )
-        # ------- Temporary columns for testing -------
         table.add_column(
             f"Alpha ({Balance.get_unit(netuid_)})",
             style=COLOR_PALETTE["POOLS"]["EXTRA_2"],
@@ -1220,24 +1203,14 @@ async def show(
             if verbose
             else f"{millify_tao(tao_sum)} {subnet_info.symbol}",
         )
-        # ------- End Temporary columns for testing -------
         table.add_column(
             "Dividends",
             style=COLOR_PALETTE["POOLS"]["EMISSION"],
             no_wrap=True,
             justify="center",
-            footer=f"{relative_emissions_sum:.3f}",
+            footer=f"{dividends_sum:.3f}",
         )
         table.add_column("Incentive", style="#5fd7ff", no_wrap=True, justify="center")
-
-        # Hiding relative emissions for now
-        # table.add_column(
-        #     "Emissions",
-        #     style="light_goldenrod2",
-        #     no_wrap=True,
-        #     justify="center",
-        #     footer=f"{relative_emissions_sum:.3f}",
-        # )
         table.add_column(
             f"Emissions ({Balance.get_unit(netuid_)})",
             style=COLOR_PALETTE["POOLS"]["EMISSION"],

bittensor_cli/src/commands/wallets.py

@@ -6,7 +6,7 @@ from typing import Generator, Optional
 
 import aiohttp
 from bittensor_wallet import Wallet, Keypair
-from bittensor_wallet.errors import KeyFileError
+from bittensor_wallet.errors import KeyFileError, PasswordError
 from bittensor_wallet.keyfile import Keyfile
 from fuzzywuzzy import fuzz
 from rich import box
@@ -286,16 +286,12 @@ async def wallet_balance(
             wallet_names = [wallet.name]
 
         block_hash = await subtensor.substrate.get_chain_head()
-        free_balances, staked_balances = await asyncio.gather(
-            subtensor.get_balances(*coldkeys, block_hash=block_hash),
-            subtensor.get_total_stake_for_coldkey(*coldkeys, block_hash=block_hash),
-        )
+        free_balances = await subtensor.get_balances(*coldkeys, block_hash=block_hash)
 
     total_free_balance = sum(free_balances.values())
-    total_staked_balance = sum(staked_balances.values())
 
     balances = {
-        name: (coldkey, free_balances[coldkey], staked_balances[coldkey])
+        name: (coldkey, free_balances[coldkey])
         for (name, coldkey) in zip(wallet_names, coldkeys)
     }
 
@@ -316,18 +312,6 @@ async def wallet_balance(
             style=COLOR_PALETTE["GENERAL"]["BALANCE"],
             no_wrap=True,
         ),
-        Column(
-            "[white]Staked Balance",
-            justify="right",
-            style=COLOR_PALETTE["STAKE"]["STAKE_AMOUNT"],
-            no_wrap=True,
-        ),
-        Column(
-            "[white]Total Balance",
-            justify="right",
-            style=COLOR_PALETTE["GENERAL"]["BALANCE"],
-            no_wrap=True,
-        ),
         title=f"\n [{COLOR_PALETTE['GENERAL']['HEADER']}]Wallet Coldkey Balance\nNetwork: {subtensor.network}",
         show_footer=True,
         show_edge=False,
@@ -338,25 +322,21 @@ async def wallet_balance(
         leading=True,
     )
 
-    for name, (coldkey, free, staked) in balances.items():
+    for name, (coldkey, free) in balances.items():
         table.add_row(
             name,
             coldkey,
             str(free),
-            str(staked),
-            str(free + staked),
         )
     table.add_row()
     table.add_row(
         "Total Balance",
         "",
         str(total_free_balance),
-        str(total_staked_balance),
-        str(total_free_balance + total_staked_balance),
     )
     console.print(Padding(table, (0, 0, 0, 4)))
     await subtensor.substrate.close()
-    return total_free_balance, total_staked_balance
+    return total_free_balance
 
 
 async def get_wallet_transfers(wallet_address: str) -> list[dict]:
@@ -1418,19 +1398,31 @@ async def check_coldkey_swap(wallet: Wallet, subtensor: SubtensorInterface):
 async def sign(wallet: Wallet, message: str, use_hotkey: str):
     """Sign a message using the provided wallet or hotkey."""
 
-    try:
-        wallet.unlock_coldkey()
-    except KeyFileError:
-        err_console.print(
-            ":cross_mark: [red]Keyfile is corrupt, non-writable, non-readable or the password used to decrypt is "
-            "invalid[/red]:[bold white]\n  [/bold white]"
-        )
+    def _unlock(key: str):
+        try:
+            getattr(wallet, f"unlock_{key}")()
+            return True
+        except PasswordError:
+            err_console.print(
+                ":cross_mark: [red]The password used to decrypt your keyfile is invalid[/red]"
+            )
+            return False
+        except KeyFileError:
+            err_console.print(
+                ":cross_mark: [red]Keyfile is corrupt, non-writable, or non-readable[/red]:"
+            )
+            return False
+
     if not use_hotkey:
+        if not _unlock("coldkey"):
+            return False
         keypair = wallet.coldkey
         print_verbose(
             f"Signing using [{COLOR_PALETTE['GENERAL']['COLDKEY']}]coldkey: {wallet.name}"
         )
     else:
+        if not _unlock("hotkey"):
+            return False
         keypair = wallet.hotkey
         print_verbose(
             f"Signing using [{COLOR_PALETTE['GENERAL']['HOTKEY']}]hotkey: {wallet.hotkey_str}"

{bittensor_cli-9.0.0rc2.dist-info → bittensor_cli-9.0.0rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bittensor-cli
-Version: 9.0.0rc2
+Version: 9.0.0rc4
 Summary: Bittensor CLI
 Home-page: https://github.com/opentensor/btcli
 Author: bittensor.com

{bittensor_cli-9.0.0rc2.dist-info → bittensor_cli-9.0.0rc4.dist-info}/RECORD

@@ -1,14 +1,14 @@
-bittensor_cli/__init__.py,sha256=ahR14ZNIE6lpjK1vEC4NA8XjHQuOaQYjySuRNJTgpno,1216
-bittensor_cli/cli.py,sha256=4o-3gpKQ9dQHLS4O4uX-rFBgIRaKH_51hgJYNqgAo1I,174144
+bittensor_cli/__init__.py,sha256=9HvyLfJ2pUxwPjgT8Aqp6uWbkuD-TKrpVMLUBeD9U9A,1216
+bittensor_cli/cli.py,sha256=LHeltSOQArKSc2Fct6dIUwXPoJs1pJoA4Y0aHvDGC_g,186698
 bittensor_cli/doc_generation_helper.py,sha256=GexqjEIKulWg84hpNBEchJ840oOgOi7DWpt447nsdNI,91
-bittensor_cli/src/__init__.py,sha256=ybFc_B-cHvxjtpAbfwHaufuQFCkW9tz4Fab7F8nuvCw,25504
+bittensor_cli/src/__init__.py,sha256=CBUMVER1JwPi2bWXhpPJ4xtZqPZyvekExOS7Fv6HtAE,25531
 bittensor_cli/src/bittensor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bittensor_cli/src/bittensor/balances.py,sha256=E-niENvR7lAaoS5ZyCmwl_9M-nspnkcuIxf_dHiJIDg,11078
 bittensor_cli/src/bittensor/chain_data.py,sha256=6VyuoDLaJz2QC9NJz9x2Ampi2fdqXumg6cCFfN-Vpq4,30642
 bittensor_cli/src/bittensor/minigraph.py,sha256=BIzmSVLfBYiRAeGD_i1LAC8Cw7zxp38a91SIFEPMqYc,10479
 bittensor_cli/src/bittensor/networking.py,sha256=pZLMs8YXpZzDMLXWMBb_Bj6TVkm_q9khyY-lnbwVMuE,462
-bittensor_cli/src/bittensor/subtensor_interface.py,sha256=koqbGIUhqHBpY4ckDF--kmwXjXb9hRK0ye5uFDUBL-g,53072
-bittensor_cli/src/bittensor/utils.py,sha256=oFr_gKcKOSi1nR6hFA2lKpnnLcOZTg5dGbKlyZE3LnU,42353
+bittensor_cli/src/bittensor/subtensor_interface.py,sha256=rwB-P0rw_h-ynO9KUNK4ODooboHpQ54RoNBKSVU9BxA,53074
+bittensor_cli/src/bittensor/utils.py,sha256=q_uSvTDpgQOqWhvwi3gi7xoROSlBJ0K1ErwUenqURag,42962
 bittensor_cli/src/bittensor/extrinsics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bittensor_cli/src/bittensor/extrinsics/registration.py,sha256=OYRq6hjKzKpZuMjsVK-3O6xeV3TCOZch3VEt8hGITjo,64169
 bittensor_cli/src/bittensor/extrinsics/root.py,sha256=PvAPkLqfcCRLAR_d1qu3YfKhywFZuHuUyy5h_XZzfR8,19359
@@ -16,17 +16,19 @@ bittensor_cli/src/bittensor/extrinsics/transfer.py,sha256=mg7hyvQX2IGVh4hkTd1u_o
 bittensor_cli/src/bittensor/templates/table.j2,sha256=P2EFiksnO1cQsB8zjK6hVJwUryHTsLslzRE0YtobAV8,10601
 bittensor_cli/src/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bittensor_cli/src/commands/sudo.py,sha256=PTOTp0_OmWksi29k4d33qmNWZAOKAcjZyU7G3wNIdjs,26343
-bittensor_cli/src/commands/wallets.py,sha256=VgTIgA9L-Ugf6n2ut3b9cmAeRKbfNznB0_mYKoeR6IA,49197
+bittensor_cli/src/commands/wallets.py,sha256=qH0TkeSQqvowZ8uGF8qeQOgyBS-KxyegD4VK0S0BG4Q,48802
 bittensor_cli/src/commands/weights.py,sha256=icJpHGLBxMUYvVUFkmPxMYuKAgBx4ELjY7f1WvX3rqg,16433
 bittensor_cli/src/commands/stake/__init__.py,sha256=uxomMv_QrYt5Qn3_X5UWFFh45ISjB0JmDmCFxVyX8nQ,6495
+bittensor_cli/src/commands/stake/add.py,sha256=57Dhu8B6EGlEBrsqtHJ4k_en5p_oZ1b0L1YbB0dEspw,25226
 bittensor_cli/src/commands/stake/children_hotkeys.py,sha256=k8XxWuoUVTaDi6PtrHwnVqc0gs9sGbrogP5XpCVbK7E,29745
-bittensor_cli/src/commands/stake/move.py,sha256=yXpBiOZJy1L3-N8t5ezerGTMeaiQpsdqjxOA7EE1iXs,37467
-bittensor_cli/src/commands/stake/stake.py,sha256=_0zUeEXm0iRQtqWAvk6qq9Y44GcItiyb2g9Ee9bdxYY,77686
+bittensor_cli/src/commands/stake/list.py,sha256=Z5pB5YlSLfY0QWR4ZWd-IWXbQRWy09FBK6iHsodWntk,29797
+bittensor_cli/src/commands/stake/move.py,sha256=YEXz5BfhAaQUJYyG11qnhXvFsSmz6ZJ6U4CWLHey4AE,37466
+bittensor_cli/src/commands/stake/remove.py,sha256=T8poiXia_9hexiVXdi7YG6SzicoEt2sIybN2SIFDyP4,43393
 bittensor_cli/src/commands/subnets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bittensor_cli/src/commands/subnets/price.py,sha256=TWcRXUFeS_Q-pfyv0YIluAL8SE7d2gzTODK-9M2J5pw,29878
-bittensor_cli/src/commands/subnets/subnets.py,sha256=a4g5Dcx28Jzrlh2HE2VQ7iEpRSnx9XUFyy1gGGPM0v0,80882
-bittensor_cli-9.0.0rc2.dist-info/METADATA,sha256=XScNNV2UmDogTn35NdwmJNrdSUGpwNFVSBvxwp1TrGw,6862
-bittensor_cli-9.0.0rc2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-bittensor_cli-9.0.0rc2.dist-info/entry_points.txt,sha256=hBTLGLbVxmAKy69XSKaUZvjTCmyEzDGZKq4S8UOto8I,49
-bittensor_cli-9.0.0rc2.dist-info/top_level.txt,sha256=DvgvXpmTtI_Q1BbDZMlK90LFcGFCreN1daViEPV2iFw,14
-bittensor_cli-9.0.0rc2.dist-info/RECORD,,
+bittensor_cli/src/commands/subnets/subnets.py,sha256=ydCKUvmEwJK3hVns4QaV_Cw4sZTajrQk0CVGs_ynBcM,79805
+bittensor_cli-9.0.0rc4.dist-info/METADATA,sha256=j_Ocs-LAFHWU_LhNEkSN6ZET6LHuHQVpX_LdOQ4cqm0,6862
+bittensor_cli-9.0.0rc4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+bittensor_cli-9.0.0rc4.dist-info/entry_points.txt,sha256=hBTLGLbVxmAKy69XSKaUZvjTCmyEzDGZKq4S8UOto8I,49
+bittensor_cli-9.0.0rc4.dist-info/top_level.txt,sha256=DvgvXpmTtI_Q1BbDZMlK90LFcGFCreN1daViEPV2iFw,14
+bittensor_cli-9.0.0rc4.dist-info/RECORD,,