Skip to content

Commit 47275a9

Browse files
authored
Merge pull request #301 from ton-blockchain/add_warning
merge add_warning into master
2 parents 41dfd36 + e9ea856 commit 47275a9

File tree

4 files changed

+28
-33
lines changed

4 files changed

+28
-33
lines changed

default_custom_overlays.json

Lines changed: 0 additions & 32 deletions
This file was deleted.

mytoncore.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2677,6 +2677,16 @@ def GetValidatorsList(self, past=False):
26772677
return validators
26782678
#end define
26792679

2680+
def find_myself_in_el(self):
2681+
save_elections = self.GetSaveElections()
2682+
my_adnl = self.GetAdnlAddr()
2683+
for election_id, election in save_elections.items():
2684+
for adnl in election:
2685+
if adnl == my_adnl:
2686+
return True
2687+
return False
2688+
#end define
2689+
26802690
def CheckValidators(self, start, end):
26812691
local.add_log("start CheckValidators function", "debug")
26822692
electionId = start

mytonctrl.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ def Init(argv):
109109
#end define
110110

111111
def PreUp():
112-
CheckMytonctrlUpdate()
112+
CheckMytonctrlUpdate() # check mtc current branch update only if there wasnt warning about mtc2
113+
CheckMytonctrl2Update()
113114
CheckDiskUsage()
114115
check_vport()
115116
# CheckTonUpdate()
@@ -229,6 +230,17 @@ def CheckMytonctrlUpdate():
229230
#end define
230231

231232

233+
def CheckMytonctrl2Update():
234+
try:
235+
if not ton.find_myself_in_el(): # we are not validator in current and prev rounds
236+
print('============================================================================================')
237+
color_print(local.translate("update_mtc2_warning"))
238+
print('============================================================================================')
239+
except Exception as err:
240+
local.add_log(f'Failed to check node as validator: {err}', "error")
241+
# end define
242+
243+
232244
def CheckDiskUsage():
233245
usage = ton.GetDbUsage()
234246
if usage > 90:

translate.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,11 @@
369369
"ru": "{green}Доступно обновление MyTonCtrl. {red}Пожалуйста, обновите его с помощью команды `update`.{endc}",
370370
"zh_TW": "{green}MyTonCtrl 有可用更新. {red}請使用 `update` 命令進行更新.{endc}"
371371
},
372+
"update_mtc2_warning": {
373+
"en": "{red}This version is outdated. Please update to the second version: `update mytonctrl2`{endc}",
374+
"ru": "{red}Данная версия устарела. Пожалуйста обновитесь на вторую версию: `update mytonctrl2`{endc}",
375+
"zh_TW": "{red}這個版本已經過時了。請更新至第二版本: `update mytonctrl2`{endc}"
376+
},
372377
"disk_usage_warning": {
373378
"en": "{red} Disk is almost full, clean the TON database immediately: https://docs.ton.org/participate/nodes/node-maintenance-and-security#database-grooming {endc}",
374379
"ru": "{red} Диск почти заполнен, немедленно очистите базу данных TON: https://docs.ton.org/participate/nodes/node-maintenance-and-security#database-grooming {endc}",

0 commit comments

Comments
 (0)