Skip to content

Commit b4222f9

Browse files
thewhalekingthewhaleking
committed
Merge remote-tracking branch 'origin/staging' into feat/thewhaleking/json-output
# Conflicts: # bittensor_cli/cli.py # bittensor_cli/src/commands/stake/add.py # bittensor_cli/src/commands/stake/list.py # bittensor_cli/src/commands/stake/remove.py # bittensor_cli/src/commands/wallets.py # bittensor_cli/version.py
2 parents bdbf76b + 9cf7abd commit b4222f9

File tree

18 files changed

+340
-433
lines changed

18 files changed

+340
-433
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## 9.1.3 /2025-03-12
4+
5+
## What's Changed
6+
* Allows childkey take of 0 by @thewhaleking in https://github.com/opentensor/btcli/pull/376
7+
* Passes prompt for pow_register by @thewhaleking in https://github.com/opentensor/btcli/pull/379
8+
* Updates staking test by @ibraheem-opentensor in https://github.com/opentensor/btcli/pull/382
9+
10+
**Full Changelog**: https://github.com/opentensor/btcli/compare/v9.1.2...v9.1.3
11+
312
## 9.1.2 /2025-03-07
413

514
## What's Changed

‎bittensor_cli/cli.py‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
WalletOptions as WO,
3232
WalletValidationTypes as WV,
3333
Constants,
34-
COLOR_PALETTE,
34+
COLORS,
3535
HYPERPARAMS,
3636
)
3737
from bittensor_cli.version import __version__, __version_as_int__
@@ -359,8 +359,8 @@ def get_optional_netuid(netuid: Optional[int], all_netuids: bool) -> Optional[in
359359
return None
360360
elif netuid is None and all_netuids is False:
361361
answer = Prompt.ask(
362-
f"Enter the [{COLOR_PALETTE['GENERAL']['SUBHEADING_MAIN']}]netuid"
363-
f"[/{COLOR_PALETTE['GENERAL']['SUBHEADING_MAIN']}] to use. Leave blank for all netuids",
362+
f"Enter the [{COLORS.G.SUBHEAD_MAIN}]netuid"
363+
f"[/{COLORS.G.SUBHEAD_MAIN}] to use. Leave blank for all netuids",
364364
default=None,
365365
show_default=False,
366366
)
@@ -969,8 +969,8 @@ def initialize_chain(
969969
elif self.config["network"]:
970970
self.subtensor = SubtensorInterface(self.config["network"])
971971
console.print(
972-
f"Using the specified network [{COLOR_PALETTE['GENERAL']['LINKS']}]{self.config['network']}"
973-
f"[/{COLOR_PALETTE['GENERAL']['LINKS']}] from config"
972+
f"Using the specified network [{COLORS.G.LINKS}]{self.config['network']}"
973+
f"[/{COLORS.G.LINKS}] from config"
974974
)
975975
else:
976976
self.subtensor = SubtensorInterface(defaults.subtensor.network)
@@ -1548,7 +1548,7 @@ def wallet_ask(
15481548
else:
15491549
wallet_name = Prompt.ask(
15501550
"Enter the [blue]wallet name[/blue]"
1551-
+ f" [{COLOR_PALETTE['GENERAL']['HINT']} italic](Hint: You can set this with `btcli config set --wallet-name`)",
1551+
+ f" [{COLORS.G.HINT} italic](Hint: You can set this with `btcli config set --wallet-name`)",
15521552
default=defaults.wallet.name,
15531553
)
15541554

@@ -2085,7 +2085,7 @@ def wallet_regen_coldkey(
20852085

20862086
if not wallet_name:
20872087
wallet_name = Prompt.ask(
2088-
f"Enter the name of the [{COLOR_PALETTE['GENERAL']['COLDKEY']}]new wallet (coldkey)",
2088+
f"Enter the name of the [{COLORS.G.CK}]new wallet (coldkey)",
20892089
default=defaults.wallet.name,
20902090
)
20912091

@@ -2144,7 +2144,7 @@ def wallet_regen_coldkey_pub(
21442144

21452145
if not wallet_name:
21462146
wallet_name = Prompt.ask(
2147-
f"Enter the name of the [{COLOR_PALETTE['GENERAL']['COLDKEY']}]new wallet (coldkey)",
2147+
f"Enter the name of the [{COLORS.G.CK}]new wallet (coldkey)",
21482148
default=defaults.wallet.name,
21492149
)
21502150
wallet = Wallet(wallet_name, wallet_hotkey, wallet_path)
@@ -2266,13 +2266,13 @@ def wallet_new_hotkey(
22662266

22672267
if not wallet_name:
22682268
wallet_name = Prompt.ask(
2269-
f"Enter the [{COLOR_PALETTE['GENERAL']['COLDKEY']}]wallet name",
2269+
f"Enter the [{COLORS.G.CK}]wallet name",
22702270
default=defaults.wallet.name,
22712271
)
22722272

22732273
if not wallet_hotkey:
22742274
wallet_hotkey = Prompt.ask(
2275-
f"Enter the name of the [{COLOR_PALETTE['GENERAL']['HOTKEY']}]new hotkey",
2275+
f"Enter the name of the [{COLORS.G.HK}]new hotkey",
22762276
default=defaults.wallet.hotkey,
22772277
)
22782278

@@ -2331,7 +2331,7 @@ def wallet_new_coldkey(
23312331

23322332
if not wallet_name:
23332333
wallet_name = Prompt.ask(
2334-
f"Enter the name of the [{COLOR_PALETTE['GENERAL']['COLDKEY']}]new wallet (coldkey)",
2334+
f"Enter the name of the [{COLORS.G.CK}]new wallet (coldkey)",
23352335
default=defaults.wallet.name,
23362336
)
23372337

@@ -2410,12 +2410,12 @@ def wallet_create_wallet(
24102410

24112411
if not wallet_name:
24122412
wallet_name = Prompt.ask(
2413-
f"Enter the name of the [{COLOR_PALETTE['GENERAL']['COLDKEY']}]new wallet (coldkey)",
2413+
f"Enter the name of the [{COLORS.G.CK}]new wallet (coldkey)",
24142414
default=defaults.wallet.name,
24152415
)
24162416
if not wallet_hotkey:
24172417
wallet_hotkey = Prompt.ask(
2418-
f"Enter the the name of the [{COLOR_PALETTE['GENERAL']['HOTKEY']}]new hotkey",
2418+
f"Enter the the name of the [{COLORS.G.HK}]new hotkey",
24192419
default=defaults.wallet.hotkey,
24202420
)
24212421

@@ -2801,14 +2801,10 @@ def wallet_sign(
28012801
self.verbosity_handler(quiet, verbose, json_output)
28022802
if use_hotkey is None:
28032803
use_hotkey = Confirm.ask(
2804-
f"Would you like to sign the transaction using your "
2805-
f"[{COLOR_PALETTE['GENERAL']['HOTKEY']}]hotkey[/{COLOR_PALETTE['GENERAL']['HOTKEY']}]?"
2806-
f"\n[Type [{COLOR_PALETTE['GENERAL']['HOTKEY']}]y"
2807-
f"[/{COLOR_PALETTE['GENERAL']['HOTKEY']}] for "
2808-
f"[{COLOR_PALETTE['GENERAL']['HOTKEY']}]hotkey[/{COLOR_PALETTE['GENERAL']['HOTKEY']}]"
2809-
f" and [{COLOR_PALETTE['GENERAL']['COLDKEY']}]n[/{COLOR_PALETTE['GENERAL']['COLDKEY']}] for "
2810-
f"[{COLOR_PALETTE['GENERAL']['COLDKEY']}]coldkey[/{COLOR_PALETTE['GENERAL']['COLDKEY']}]] "
2811-
f"(default is [{COLOR_PALETTE['GENERAL']['COLDKEY']}]coldkey[/{COLOR_PALETTE['GENERAL']['COLDKEY']}])",
2804+
f"Would you like to sign the transaction using your [{COLORS.G.HK}]hotkey[/{COLORS.G.HK}]?"
2805+
f"\n[Type [{COLORS.G.HK}]y[/{COLORS.G.HK}] for [{COLORS.G.HK}]hotkey[/{COLORS.G.HK}]"
2806+
f" and [{COLORS.G.CK}]n[/{COLORS.G.CK}] for [{COLORS.G.CK}]coldkey[/{COLORS.G.CK}]] "
2807+
f"(default is [{COLORS.G.CK}]coldkey[/{COLORS.G.CK}])",
28122808
default=False,
28132809
)
28142810

@@ -3102,11 +3098,11 @@ def stake_add(
31023098
raise typer.Exit()
31033099
if netuid is not None:
31043100
amount = FloatPrompt.ask(
3105-
f"Amount to [{COLOR_PALETTE['GENERAL']['SUBHEADING_MAIN']}]stake (TAO τ)"
3101+
f"Amount to [{COLORS.G.SUBHEAD_MAIN}]stake (TAO τ)"
31063102
)
31073103
else:
31083104
amount = FloatPrompt.ask(
3109-
f"Amount to [{COLOR_PALETTE['GENERAL']['SUBHEADING_MAIN']}]stake to each netuid (TAO τ)"
3105+
f"Amount to [{COLORS.G.SUBHEAD_MAIN}]stake to each netuid (TAO τ)"
31103106
)
31113107

31123108
if amount <= 0:
@@ -4206,7 +4202,8 @@ def sudo_set(
42064202
if not param_value:
42074203
if HYPERPARAMS.get(param_name):
42084204
param_value = Prompt.ask(
4209-
f"Enter the new value for [{COLOR_PALETTE['GENERAL']['SUBHEADING']}]{param_name}[/{COLOR_PALETTE['GENERAL']['SUBHEADING']}] in the VALUE column format"
4205+
f"Enter the new value for [{COLORS.G.SUBHEAD}]{param_name}[/{COLORS.G.SUBHEAD}] "
4206+
f"in the VALUE column format"
42104207
)
42114208
else:
42124209
param_value = None

‎bittensor_cli/src/__init__.py‎

Lines changed: 105 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -721,64 +721,111 @@ class WalletValidationTypes(Enum):
721721
},
722722
}
723723

724-
COLOR_PALETTE = {
725-
"GENERAL": {
726-
"HEADER": "#4196D6", # Light Blue
727-
"LINKS": "#8CB9E9", # Sky Blue
728-
"HINT": "#A2E5B8", # Mint Green
729-
"COLDKEY": "#9EF5E4", # Aqua
730-
"HOTKEY": "#ECC39D", # Light Orange/Peach
731-
"SUBHEADING_MAIN": "#7ECFEC", # Light Cyan
732-
"SUBHEADING": "#AFEFFF", # Pale Blue
733-
"SUBHEADING_EXTRA_1": "#96A3C5", # Grayish Blue
734-
"SUBHEADING_EXTRA_2": "#6D7BAF", # Slate Blue
735-
"CONFIRMATION_Y_N_Q": "#EE8DF8", # Light Purple/Pink
736-
"SYMBOL": "#E7CC51", # Gold
737-
"BALANCE": "#4F91C6", # Medium Blue
738-
"COST": "#53B5A0", # Teal
739-
"SUCCESS": "#53B5A0", # Teal
740-
"NETUID": "#CBA880", # Tan
741-
"NETUID_EXTRA": "#DDD5A9", # Light Khaki
742-
"TEMPO": "#67A3A5", # Grayish Teal
743-
},
744-
"STAKE": {
745-
"STAKE_AMOUNT": "#53B5A0", # Teal
746-
"STAKE_ALPHA": "#53B5A0", # Teal
747-
"STAKE_SWAP": "#67A3A5", # Grayish Teal
748-
"TAO": "#4F91C6", # Medium Blue
749-
"SLIPPAGE_TEXT": "#C25E7C", # Rose
750-
"SLIPPAGE_PERCENT": "#E7B195", # Light Coral
751-
"NOT_REGISTERED": "#EB6A6C", # Salmon Red
752-
"EXTRA_1": "#D781BB", # Pink
753-
},
754-
"POOLS": {
755-
"TAO": "#4F91C6", # Medium Blue
756-
"ALPHA_IN": "#D09FE9", # Light Purple
757-
"ALPHA_OUT": "#AB7CC8", # Medium Purple
758-
"RATE": "#F8D384", # Light Orange
759-
"TAO_EQUIV": "#8CB9E9", # Sky Blue
760-
"EMISSION": "#F8D384", # Light Orange
761-
"EXTRA_1": "#CAA8FB", # Lavender
762-
"EXTRA_2": "#806DAF", # Dark Purple
763-
},
764-
"GREY": {
765-
"GREY_100": "#F8F9FA", # Almost White
766-
"GREY_200": "#F1F3F4", # Very Light Grey
767-
"GREY_300": "#DBDDE1", # Light Grey
768-
"GREY_400": "#BDC1C6", # Medium Light Grey
769-
"GREY_500": "#5F6368", # Medium Grey
770-
"GREY_600": "#2E3134", # Medium Dark Grey
771-
"GREY_700": "#282A2D", # Dark Grey
772-
"GREY_800": "#17181B", # Very Dark Grey
773-
"GREY_900": "#0E1013", # Almost Black
774-
"BLACK": "#000000", # Pure Black
775-
},
776-
"SUDO": {
777-
"HYPERPARAMETER": "#4F91C6", # Medium Blue
778-
"VALUE": "#D09FE9", # Light Purple
779-
"NORMALIZED": "#AB7CC8", # Medium Purple
780-
},
781-
}
724+
725+
class Gettable:
726+
def __getitem__(self, item):
727+
return getattr(self, item)
728+
729+
730+
class ColorPalette(Gettable):
731+
def __init__(self):
732+
self.GENERAL = self.General()
733+
self.STAKE = self.Stake()
734+
self.POOLS = self.Pools()
735+
self.GREY = self.Grey()
736+
self.SUDO = self.Sudo()
737+
# aliases
738+
self.G = self.GENERAL
739+
self.S = self.STAKE
740+
self.P = self.POOLS
741+
self.GR = self.GREY
742+
self.SU = self.SUDO
743+
744+
class General(Gettable):
745+
HEADER = "#4196D6" # Light Blue
746+
LINKS = "#8CB9E9" # Sky Blue
747+
HINT = "#A2E5B8" # Mint Green
748+
COLDKEY = "#9EF5E4" # Aqua
749+
HOTKEY = "#ECC39D" # Light Orange/Peach
750+
SUBHEADING_MAIN = "#7ECFEC" # Light Cyan
751+
SUBHEADING = "#AFEFFF" # Pale Blue
752+
SUBHEADING_EXTRA_1 = "#96A3C5" # Grayish Blue
753+
SUBHEADING_EXTRA_2 = "#6D7BAF" # Slate Blue
754+
CONFIRMATION_Y_N_Q = "#EE8DF8" # Light Purple/Pink
755+
SYMBOL = "#E7CC51" # Gold
756+
BALANCE = "#4F91C6" # Medium Blue
757+
COST = "#53B5A0" # Teal
758+
SUCCESS = "#53B5A0" # Teal
759+
NETUID = "#CBA880" # Tan
760+
NETUID_EXTRA = "#DDD5A9" # Light Khaki
761+
TEMPO = "#67A3A5" # Grayish Teal
762+
# aliases
763+
CK = COLDKEY
764+
HK = HOTKEY
765+
SUBHEAD_MAIN = SUBHEADING_MAIN
766+
SUBHEAD = SUBHEADING
767+
SUBHEAD_EX_1 = SUBHEADING_EXTRA_1
768+
SUBHEAD_EX_2 = SUBHEADING_EXTRA_2
769+
SYM = SYMBOL
770+
BAL = BALANCE
771+
772+
class Stake(Gettable):
773+
STAKE_AMOUNT = "#53B5A0" # Teal
774+
STAKE_ALPHA = "#53B5A0" # Teal
775+
STAKE_SWAP = "#67A3A5" # Grayish Teal
776+
TAO = "#4F91C6" # Medium Blue
777+
SLIPPAGE_TEXT = "#C25E7C" # Rose
778+
SLIPPAGE_PERCENT = "#E7B195" # Light Coral
779+
NOT_REGISTERED = "#EB6A6C" # Salmon Red
780+
EXTRA_1 = "#D781BB" # Pink
781+
# aliases
782+
AMOUNT = STAKE_AMOUNT
783+
ALPHA = STAKE_ALPHA
784+
SWAP = STAKE_SWAP
785+
786+
class Pools(Gettable):
787+
TAO = "#4F91C6" # Medium Blue
788+
ALPHA_IN = "#D09FE9" # Light Purple
789+
ALPHA_OUT = "#AB7CC8" # Medium Purple
790+
RATE = "#F8D384" # Light Orange
791+
TAO_EQUIV = "#8CB9E9" # Sky Blue
792+
EMISSION = "#F8D384" # Light Orange
793+
EXTRA_1 = "#CAA8FB" # Lavender
794+
EXTRA_2 = "#806DAF" # Dark Purple
795+
796+
class Grey(Gettable):
797+
GREY_100 = "#F8F9FA" # Almost White
798+
GREY_200 = "#F1F3F4" # Very Light Grey
799+
GREY_300 = "#DBDDE1" # Light Grey
800+
GREY_400 = "#BDC1C6" # Medium Light Grey
801+
GREY_500 = "#5F6368" # Medium Grey
802+
GREY_600 = "#2E3134" # Medium Dark Grey
803+
GREY_700 = "#282A2D" # Dark Grey
804+
GREY_800 = "#17181B" # Very Dark Grey
805+
GREY_900 = "#0E1013" # Almost Black
806+
BLACK = "#000000" # Pure Black
807+
# aliases
808+
G_100 = GREY_100
809+
G_200 = GREY_200
810+
G_300 = GREY_300
811+
G_400 = GREY_400
812+
G_500 = GREY_500
813+
G_600 = GREY_600
814+
G_700 = GREY_700
815+
G_800 = GREY_800
816+
G_900 = GREY_900
817+
818+
class Sudo(Gettable):
819+
HYPERPARAMETER = "#4F91C6" # Medium Blue
820+
VALUE = "#D09FE9" # Light Purple
821+
NORMALIZED = "#AB7CC8" # Medium Purple
822+
# aliases
823+
HYPERPARAM = HYPERPARAMETER
824+
NORMAL = NORMALIZED
825+
826+
827+
COLOR_PALETTE = ColorPalette()
828+
COLORS = COLOR_PALETTE
782829

783830

784831
SUBNETS = {

‎bittensor_cli/src/bittensor/chain_data.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,9 @@ def tao_to_alpha(self, tao: Balance) -> Balance:
745745
def alpha_to_tao(self, alpha: Balance) -> Balance:
746746
return Balance.from_tao(alpha.tao * self.price.tao)
747747

748-
def tao_to_alpha_with_slippage(self, tao: Balance) -> tuple[Balance, Balance]:
748+
def tao_to_alpha_with_slippage(
749+
self, tao: Balance
750+
) -> tuple[Balance, Balance, float]:
749751
"""
750752
Returns an estimate of how much Alpha would a staker receive if they stake their tao using the current pool state.
751753
Args:

0 commit comments

Comments
 (0)