Skip to content

Commit a82ad84

Browse files
committed
add network name into status
1 parent 8047e59 commit a82ad84

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

mytoncore/mytoncore.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,6 +1208,8 @@ def SignBocWithWallet(self, wallet, boc_path, dest, coins, **kwargs):
12081208
elif "v3" in wallet.version:
12091209
fift_script = "wallet-v3.fif"
12101210
args = [fift_script, wallet.path, dest, subwallet, seqno, coins, boc_mode, boc_path, result_file_path]
1211+
else:
1212+
raise Exception(f"SignBocWithWallet error: Wallet version '{wallet.version}' is not supported")
12111213
if flags:
12121214
args += flags
12131215
result = self.fift.Run(args)
@@ -1912,6 +1914,8 @@ def MoveCoins(self, wallet, dest, coins, **kwargs):
19121914
elif "v3" in wallet.version:
19131915
fiftScript = "wallet-v3.fif"
19141916
args = [fiftScript, wallet.path, dest, subwallet, seqno, coins, "-m", mode, resultFilePath]
1917+
else:
1918+
raise Exception(f"MoveCoins error: Wallet version '{wallet.version}' is not supported")
19151919
if flags:
19161920
args += flags
19171921
result = self.fift.Run(args)

mytonctrl/mytonctrl.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ def PrintStatus(local, ton, args):
533533

534534
all_status = validator_status.is_working == True and validator_status.out_of_sync < 20
535535
if all_status:
536+
network_name = ton.GetNetworkName()
536537
rootWorkchainEnabledTime_int = ton.GetRootWorkchainEnabledTime()
537538
config34 = ton.GetConfig34()
538539
config36 = ton.GetConfig36()
@@ -566,27 +567,30 @@ def PrintStatus(local, ton, args):
566567
#end if
567568

568569
if all_status:
569-
PrintTonStatus(local, startWorkTime, totalValidators, onlineValidators, shardsNumber, offersNumber, complaintsNumber, tpsAvg)
570+
PrintTonStatus(local, network_name, startWorkTime, totalValidators, onlineValidators, shardsNumber, offersNumber, complaintsNumber, tpsAvg)
570571
PrintLocalStatus(local, adnl_addr, validator_index, validator_efficiency, validator_wallet, validator_account, validator_status,
571572
db_size, db_usage, memory_info, swap_info, net_load_avg, disks_load_avg, disks_load_percent_avg)
572573
if all_status:
573574
PrintTonConfig(local, fullConfigAddr, fullElectorAddr, config15, config17)
574575
PrintTimes(local, rootWorkchainEnabledTime_int, startWorkTime, oldStartWorkTime, config15)
575576
#end define
576577

577-
def PrintTonStatus(local, startWorkTime, totalValidators, onlineValidators, shardsNumber, offersNumber, complaintsNumber, tpsAvg):
578-
tps1 = tpsAvg[0]
579-
tps5 = tpsAvg[1]
580-
tps15 = tpsAvg[2]
578+
def PrintTonStatus(local, network_name, startWorkTime, totalValidators, onlineValidators, shardsNumber, offersNumber, complaintsNumber, tpsAvg):
579+
#tps1 = tpsAvg[0]
580+
#tps5 = tpsAvg[1]
581+
#tps15 = tpsAvg[2]
581582
allValidators = totalValidators
582583
newOffers = offersNumber.get("new")
583584
allOffers = offersNumber.get("all")
584585
newComplaints = complaintsNumber.get("new")
585586
allComplaints = complaintsNumber.get("all")
586-
tps1_text = bcolors.green_text(tps1)
587-
tps5_text = bcolors.green_text(tps5)
588-
tps15_text = bcolors.green_text(tps15)
589-
tps_text = local.translate("ton_status_tps").format(tps1_text, tps5_text, tps15_text)
587+
#tps1_text = bcolors.green_text(tps1)
588+
#tps5_text = bcolors.green_text(tps5)
589+
#tps15_text = bcolors.green_text(tps15)
590+
591+
color_network_name = bcolors.green_text(network_name) if network_name == "mainnet" else bcolors.yellow_text(network_name)
592+
network_name_text = local.translate("ton_status_network_name").format(color_network_name)
593+
#tps_text = local.translate("ton_status_tps").format(tps1_text, tps5_text, tps15_text)
590594
onlineValidators_text = GetColorInt(onlineValidators, border=allValidators*2/3, logic="more")
591595
allValidators_text = bcolors.yellow_text(allValidators)
592596
validators_text = local.translate("ton_status_validators").format(onlineValidators_text, allValidators_text)
@@ -605,7 +609,8 @@ def PrintTonStatus(local, startWorkTime, totalValidators, onlineValidators, shar
605609
election_text = local.translate("ton_status_election").format(election_text)
606610

607611
color_print(local.translate("ton_status_head"))
608-
print(tps_text)
612+
print(network_name_text)
613+
#print(tps_text)
609614
print(validators_text)
610615
print(shards_text)
611616
print(offers_text)

mytonctrl/resources/translate.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,11 @@
224224
"ru": "{cyan}===[ Статус сети TON ]==={endc}",
225225
"zh_TW": "{cyan}===[ TON 網路狀態 ]==={endc}"
226226
},
227+
"ton_status_network_name": {
228+
"en": "Network name: {0}",
229+
"ru": "Название сети: {0}",
230+
"zh_TW": "網路名字: {0}"
231+
},
227232
"ton_status_tps": {
228233
"en": "Transactions per second (TPS): {0}, {1}, {2}",
229234
"ru": "Транзакций в секунду (TPS): {0}, {1}, {2}",

0 commit comments

Comments
 (0)