diff --git a/default_custom_overlays.json b/default_custom_overlays.json deleted file mode 100644 index 8d5f5e2e..00000000 --- a/default_custom_overlays.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "mainnet": { - "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA": { - "msg_sender": true, - "msg_sender_priority": 15 - }, - "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB": { - "msg_sender": true, - "msg_sender_priority": 10 - }, - "@validators": true - }, - "testnet": { - "DF27B30444D07087863B77F8BD27BABA8E57EDECA393605F6610FDCB64FFECD1": { - "msg_sender": true, - "msg_sender_priority": 14 - }, - "B360D229CA597906ADFC522FAC3EB5F8AE9D80981693225E7083577A4F016118": { - "msg_sender": true, - "msg_sender_priority": 10 - }, - "F794DE0B21423B6F4C168C5652758E5743CD977ACE13B3B2BA88E28580D9BEDB": { - "msg_sender": true, - "msg_sender_priority": 10 - }, - "6447CEAC80573AF2ABCA741FC940BB690AC263DC4B779FB6609CE5E9A4B31AE1": { - "msg_sender": true, - "msg_sender_priority": 5 - }, - "@validators": true - } -} \ No newline at end of file diff --git a/mytoncore.py b/mytoncore.py index a24c59c6..ed132f58 100755 --- a/mytoncore.py +++ b/mytoncore.py @@ -2677,6 +2677,16 @@ def GetValidatorsList(self, past=False): return validators #end define + def find_myself_in_el(self): + save_elections = self.GetSaveElections() + my_adnl = self.GetAdnlAddr() + for election_id, election in save_elections.items(): + for adnl in election: + if adnl == my_adnl: + return True + return False + #end define + def CheckValidators(self, start, end): local.add_log("start CheckValidators function", "debug") electionId = start diff --git a/mytonctrl.py b/mytonctrl.py index 046d1676..1cbb1683 100755 --- a/mytonctrl.py +++ b/mytonctrl.py @@ -109,7 +109,8 @@ def Init(argv): #end define def PreUp(): - CheckMytonctrlUpdate() + CheckMytonctrlUpdate() # check mtc current branch update only if there wasnt warning about mtc2 + CheckMytonctrl2Update() CheckDiskUsage() check_vport() # CheckTonUpdate() @@ -229,6 +230,17 @@ def CheckMytonctrlUpdate(): #end define +def CheckMytonctrl2Update(): + try: + if not ton.find_myself_in_el(): # we are not validator in current and prev rounds + print('============================================================================================') + color_print(local.translate("update_mtc2_warning")) + print('============================================================================================') + except Exception as err: + local.add_log(f'Failed to check node as validator: {err}', "error") +# end define + + def CheckDiskUsage(): usage = ton.GetDbUsage() if usage > 90: diff --git a/translate.json b/translate.json index 294ac055..e2aa23ed 100644 --- a/translate.json +++ b/translate.json @@ -369,6 +369,11 @@ "ru": "{green}Доступно обновление MyTonCtrl. {red}Пожалуйста, обновите его с помощью команды `update`.{endc}", "zh_TW": "{green}MyTonCtrl 有可用更新. {red}請使用 `update` 命令進行更新.{endc}" }, + "update_mtc2_warning": { + "en": "{red}This version is outdated. Please update to the second version: `update mytonctrl2`{endc}", + "ru": "{red}Данная версия устарела. Пожалуйста обновитесь на вторую версию: `update mytonctrl2`{endc}", + "zh_TW": "{red}這個版本已經過時了。請更新至第二版本: `update mytonctrl2`{endc}" + }, "disk_usage_warning": { "en": "{red} Disk is almost full, clean the TON database immediately: https://docs.ton.org/participate/nodes/node-maintenance-and-security#database-grooming {endc}", "ru": "{red} Диск почти заполнен, немедленно очистите базу данных TON: https://docs.ton.org/participate/nodes/node-maintenance-and-security#database-grooming {endc}",