Skip to content

Small Bug Fixes #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thewhaleking merged 6 commits into from
Nov 17, 2025
Merged

Small Bug Fixes #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2bb11b1
Add type annotations, fix possible type errors
thewhaleking Nov 17, 2025
fe1be23
Use genesis address to verify not hotkey
thewhaleking Nov 17, 2025
61aa92e
Ruff
thewhaleking Nov 17, 2025
76189b3
Name shadowing
thewhaleking Nov 17, 2025
f0f7d4d
Be more clear about the display of the totals in `st list`
thewhaleking Nov 17, 2025
1807354
Turn off auto shutdown timer as we explicitly close the ws connection…
thewhaleking Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions bittensor_cli/src/bittensor/extrinsics/transfer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
from async_substrate_interface.errors import SubstrateRequestException

from bittensor_cli.src.bittensor.balances import Balance
from bittensor_cli.src.bittensor.subtensor_interface import SubtensorInterface
from bittensor_cli.src.bittensor.subtensor_interface import (
SubtensorInterface,
GENESIS_ADDRESS,
)
from bittensor_cli.src.bittensor.utils import (
console,
err_console,
Expand Down Expand Up @@ -173,7 +176,7 @@ async def do_transfer() -> tuple[bool, str, str, AsyncExtrinsicReceipt]:
# Ask before moving on.
if prompt:
hk_owner = await subtensor.get_hotkey_owner(destination, check_exists=False)
if hk_owner and hk_owner != destination:
if hk_owner and hk_owner not in (destination, GENESIS_ADDRESS):
if not Confirm.ask(
f"The destination appears to be a hotkey, owned by [bright_magenta]{hk_owner}[/bright_magenta]. "
f"Only proceed if you are absolutely sure that [bright_magenta]{destination}[/bright_magenta] is the "
Expand Down
22 changes: 15 additions & 7 deletions bittensor_cli/src/bittensor/subtensor_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
get_hotkey_pub_ss58,
)

GENESIS_ADDRESS = "5C4hrfjw9DjXZTzV3MwzrrAr9P1MJhSrvWGWqi1eSuyUpnhM"


class ParamWithTypes(TypedDict):
name: str # Name of the parameter.
Expand Down Expand Up @@ -118,6 +120,7 @@ def __init__(self, network, use_disk_cache: bool = False):
ss58_format=SS58_FORMAT,
type_registry=TYPE_REGISTRY,
chain_name="Bittensor",
ws_shutdown_timer=None,
)

def __str__(self):
Expand Down Expand Up @@ -1116,7 +1119,7 @@ async def does_hotkey_exist(
block_hash=block_hash,
reuse_block_hash=reuse_block,
)
return_val = result != "5C4hrfjw9DjXZTzV3MwzrrAr9P1MJhSrvWGWqi1eSuyUpnhM"
return_val = result != GENESIS_ADDRESS
return return_val

async def get_hotkey_owner(
Expand Down Expand Up @@ -2103,7 +2106,7 @@ async def get_claimable_stakes_for_coldkey(
if not stakes_info:
return {}

root_stakes = {}
root_stakes: dict[str, Balance] = {}
for stake_info in stakes_info:
if stake_info.netuid == 0 and stake_info.stake.rao > 0:
root_stakes[stake_info.hotkey_ss58] = stake_info.stake
Expand Down Expand Up @@ -2149,8 +2152,8 @@ async def get_claimable_stakes_for_coldkey(
self.substrate.query_multi(batch_claimed_calls, block_hash=block_hash),
)

claimable_rates = {}
claimed_amounts = {}
claimable_rates: dict[str, dict[int, float]] = {}
claimed_amounts: dict[tuple[str, int], Balance] = {}
for idx, (_, result) in enumerate(batch_claimable):
hotkey = unique_hotkeys[idx]
if result:
Expand All @@ -2166,12 +2169,17 @@ async def get_claimable_stakes_for_coldkey(

# Calculate the claimable stake for each pair
results = {}
already_claimed: Balance
net_claimable: Balance
rate: float
root_stake: Balance
claimable_stake: Balance
for hotkey, netuid in target_pairs:
root_stake = root_stakes[hotkey]
rate = claimable_rates[hotkey].get(netuid, 0)
rate = claimable_rates[hotkey].get(netuid, 0.0)
claimable_stake = rate * root_stake
already_claimed = claimed_amounts.get((hotkey, netuid), 0)
net_claimable = max(claimable_stake - already_claimed, 0)
already_claimed = claimed_amounts.get((hotkey, netuid), Balance(0))
net_claimable = max(claimable_stake - already_claimed, Balance(0))
if hotkey not in results:
results[hotkey] = {}
results[hotkey][netuid] = net_claimable.set_unit(netuid)
Expand Down
20 changes: 12 additions & 8 deletions bittensor_cli/src/commands/stake/list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def define_table(

def create_table(
hotkey_: str,
substakes: list[StakeInfo],
substakes_: list[StakeInfo],
claimable_amounts_: dict[str, dict[int, Balance]],
):
name_ = (
Expand All @@ -164,9 +164,9 @@ def create_table(
rows = []
total_tao_value_ = Balance(0)
total_swapped_tao_value_ = Balance(0)
root_stakes = [s for s in substakes if s.netuid == 0]
root_stakes = [s for s in substakes_ if s.netuid == 0]
other_stakes = sorted(
[s for s in substakes if s.netuid != 0],
[s for s in substakes_ if s.netuid != 0],
key=lambda x: dynamic_info[x.netuid]
.alpha_to_tao(Balance.from_rao(int(x.stake.rao)).set_unit(x.netuid))
.tao,
Expand Down Expand Up @@ -626,7 +626,7 @@ def format_cell(
input()

total_tao_value = (
f"τ {millify_tao(all_hks_tao_value.tao)}"
f"τ {millify_tao(all_hks_tao_value.tao + balance.tao)}"
if not verbose
else all_hks_tao_value
)
Expand All @@ -638,10 +638,14 @@ def format_cell(
console.print("\n\n")
console.print(
f"Wallet:\n"
f" Coldkey SS58: [{COLOR_PALETTE['GENERAL']['COLDKEY']}]{coldkey_address}[/{COLOR_PALETTE['GENERAL']['COLDKEY']}]\n"
f" Free Balance: [{COLOR_PALETTE['GENERAL']['BALANCE']}]{balance}[/{COLOR_PALETTE['GENERAL']['BALANCE']}]\n"
f" Total TAO Value ({Balance.unit}): [{COLOR_PALETTE['GENERAL']['BALANCE']}]{total_tao_value}[/{COLOR_PALETTE['GENERAL']['BALANCE']}]"
# f"\n Total TAO Swapped Value ({Balance.unit}): [{COLOR_PALETTE['GENERAL']['BALANCE']}]{total_swapped_tao_value}[/{COLOR_PALETTE['GENERAL']['BALANCE']}]"
f" Coldkey SS58: "
f"[{COLOR_PALETTE.G.CK}]{coldkey_address}[/{COLOR_PALETTE.G.CK}]\n"
f" Free Balance: "
f"[{COLOR_PALETTE.G.BALANCE}]{balance}[/{COLOR_PALETTE.G.BALANCE}]\n"
f" Total TAO Swapped Value ({Balance.unit}): "
f"[{COLOR_PALETTE.G.BALANCE}]{total_swapped_tao_value}[/{COLOR_PALETTE.G.BALANCE}]\n"
f" Total TAO Value (including free balance) ({Balance.unit}): "
f"[{COLOR_PALETTE.G.BALANCE}]{total_tao_value}[/{COLOR_PALETTE.G.BALANCE}]\n"
)
dict_output["free_balance"] = balance.tao
dict_output["total_tao_value"] = all_hks_tao_value.tao
Expand Down
10 changes: 5 additions & 5 deletions bittensor_cli/src/commands/wallets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@
)
from bittensor_cli.src.bittensor.extrinsics.transfer import transfer_extrinsic
from bittensor_cli.src.bittensor.networking import int_to_ip
from bittensor_cli.src.bittensor.subtensor_interface import SubtensorInterface
from bittensor_cli.src.bittensor.subtensor_interface import (
SubtensorInterface,
GENESIS_ADDRESS,
)
from bittensor_cli.src.bittensor.utils import (
RAO_PER_TAO,
console,
Expand Down Expand Up @@ -2261,10 +2264,7 @@ async def check_swap_status(
chain_reported_completion_block, destination_address = await subtensor.query(
"SubtensorModule", "ColdkeySwapScheduled", [origin_ss58]
)
if (
chain_reported_completion_block != 0
and destination_address != "5C4hrfjw9DjXZTzV3MwzrrAr9P1MJhSrvWGWqi1eSuyUpnhM"
):
if chain_reported_completion_block != 0 and destination_address != GENESIS_ADDRESS:
is_pending = True
else:
is_pending = False
Expand Down
Loading