Skip to content

Commit e9ea856

Browse files
committed
replace find_myself_in_vl with find_myself_in_el
1 parent 394f781 commit e9ea856

File tree

4 files changed

+12
-43
lines changed

4 files changed

+12
-43
lines changed

default_custom_overlays.json

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

mytoncore.py

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

2680-
def find_myself_in_vl(self):
2681-
current_vl = self.GetValidatorsList()
2682-
past_vl = self.GetValidatorsList(past=True)
2680+
def find_myself_in_el(self):
2681+
save_elections = self.GetSaveElections()
26832682
my_adnl = self.GetAdnlAddr()
2684-
for validator in current_vl + past_vl:
2685-
if validator["adnlAddr"] == my_adnl:
2686-
return True
2683+
for election_id, election in save_elections.items():
2684+
for adnl in election:
2685+
if adnl == my_adnl:
2686+
return True
26872687
return False
2688+
#end define
26882689

26892690
def CheckValidators(self, start, end):
26902691
local.add_log("start CheckValidators function", "debug")

mytonctrl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,12 @@ def CheckMytonctrlUpdate():
232232

233233
def CheckMytonctrl2Update():
234234
try:
235-
if not ton.find_myself_in_vl(): # we are not validator in current and prev rounds
235+
if not ton.find_myself_in_el(): # we are not validator in current and prev rounds
236236
print('============================================================================================')
237237
color_print(local.translate("update_mtc2_warning"))
238238
print('============================================================================================')
239239
except Exception as err:
240-
print(f'Failed to check node as validator: {err}')
240+
local.add_log(f'Failed to check node as validator: {err}', "error")
241241
# end define
242242

243243

translate.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,9 @@
370370
"zh_TW": "{green}MyTonCtrl 有可用更新. {red}請使用 `update` 命令進行更新.{endc}"
371371
},
372372
"update_mtc2_warning": {
373-
"en": "{red} If you are not a validator and using node only as liteserver, update to the MyTonCtrl2.0: `update mytonctrl2`. After updating turn \"liteserver\" mode on: `disable_mode validator`; `enable_mode liteserver` {endc}",
374-
"ru": "{red} Если вы не валидатор и используете ноду только как лайтсервер, обновитесь до MyTonCtrl2.0: `update mytonctrl2`. После обновления включите режим \"Лайтсервера\": `disable_mode validator`; `enable_mode liteserver` {endc}",
375-
"zh_TW": "{red} 如果您不是驗證者,僅將節點用作 liteserver,更新到 MyTonCtrl2.0: `update mytonctrl2`。更新後,將 \"liteserver\" 模式打開: `disable_mode validator`; `enable_mode liteserver` {endc}"
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}"
376376
},
377377
"disk_usage_warning": {
378378
"en": "{red} Disk is almost full, clean the TON database immediately: https://docs.ton.org/participate/nodes/node-maintenance-and-security#database-grooming {endc}",

0 commit comments

Comments
 (0)