Merge branch 'dev' into exec-start-pre

Author: yungwine

modules/alert_bot.py

@@ -218,6 +218,7 @@ def disable_alert(self, args):
         color_print("disable_alert - {green}OK{endc}")
 
     def print_alerts(self, args):
+        init_alerts()
         table = [['Name', 'Enabled', 'Last sent']]
         for alert_name in ALERTS:
             alert = self.get_alert_from_db(alert_name)
@@ -337,7 +338,7 @@ def check_stake_returned(self):
         if not self.ton.using_validator():
             return
         config = self.ton.GetConfig32()
-        if not (config['endWorkTime'] + FREEZE_PERIOD + 1800 <= time.time() < config['endWorkTime'] + FREEZE_PERIOD + 1860):  # check between 25th and 26th minutes after stakes have been unfrozen
+        if not (config['endWorkTime'] + FREEZE_PERIOD + 1800 <= time.time() < config['endWorkTime'] + FREEZE_PERIOD + 1860):  # check between 30th and 31st minutes after stakes have been unfrozen
             return
         res = self.get_myself_from_election(config)
         if not res:
@@ -356,6 +357,9 @@ def check_voting(self):
         validator_index = self.ton.GetValidatorIndex()
         if validator_index == -1:
             return
+        config = self.ton.GetConfig34()
+        if time.time() - config['startWorkTime'] < 600:  # less than 10 minutes passed since round start
+            return
         need_to_vote = []
         offers = self.ton.GetOffers()
         for offer in offers:

modules/prometheus.py

@@ -44,12 +44,15 @@ def get_validator_status_metrics(self, result: list):
             result.append(METRICS['master_out_of_sync'].to_format(status.masterchain_out_of_sync))
         if status.shardchain_out_of_sync is not None:
             result.append(METRICS['shard_out_of_sync'].to_format(status.shardchain_out_of_sync))
-        if status.masterchain_out_of_ser is not None:
+        if status.masterchain_out_of_ser is not None and status.stateserializermasterchainseqno != 0:
             result.append(METRICS['out_of_ser'].to_format(status.masterchain_out_of_ser))
         if status.masterchainblock is not None and status.gcmasterchainblock is not None:
             result.append(METRICS['celldb_gc_block'].to_format(status.masterchainblock - status.gcmasterchainblock))
         if status.gcmasterchainblock is not None and status.last_deleted_mc_state is not None:
-            result.append(METRICS['celldb_gc_state'].to_format(status.gcmasterchainblock - status.last_deleted_mc_state))
+            if status.last_deleted_mc_state != 0:
+                result.append(METRICS['celldb_gc_state'].to_format(status.gcmasterchainblock - status.last_deleted_mc_state))
+            else:
+                result.append(METRICS['celldb_gc_state'].to_format(-1))
         result.append(METRICS['vc_up'].to_format(int(is_working)))
 
     def get_validator_validation_metrics(self, result: list):

mytonctrl/mytonctrl.py

@@ -370,14 +370,6 @@ def Upgrade(ton, args):
 	upgrade_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/upgrade.sh')
 	runArgs = ["bash", upgrade_script_path, "-a", author, "-r", repo, "-b", branch]
 	exitCode = run_as_root(runArgs)
-	if ton.using_validator():
-		try:
-			from mytoninstaller.mytoninstaller import set_node_argument, get_node_args
-			node_args = get_node_args()
-			if node_args.get('--state-ttl') == '604800':
-				set_node_argument(ton.local, ["--state-ttl", "-d"])
-		except Exception as e:
-			color_print(f"{{red}}Failed to set node argument: {e} {{endc}}")
 	if exitCode == 0:
 		text = "Upgrade - {green}OK{endc}"
 	else:

mytonctrl/scripts/restore_backup.sh

@@ -16,6 +16,10 @@ do
 	esac
 done
 
+if [ ! -f "$name" ]; then
+    echo "Backup file not found, aborting."
+    exit 1
+fi
 
 COLOR='\033[92m'
 ENDC='\033[0m'
@@ -43,6 +47,8 @@ rm -rf /var/ton-work/db/keyring
 
 chown -R $user:$user ${tmp_dir}/mytoncore
 chown -R $user:$user ${tmp_dir}/keys
+chown validator:validator ${tmp_dir}/keys
+chown -R validator:validator ${tmp_dir}/db
 
 cp -rfp ${tmp_dir}/db /var/ton-work
 cp -rfp ${tmp_dir}/keys /var/ton-work

mytoninstaller/config.py

@@ -43,17 +43,6 @@ def backup_config(local, config_path):
 #end define
 
 
-def BackupVconfig(local):
-	if local.buffer.only_mtc:
-		return
-	local.add_log("Backup validator config file 'config.json' to 'config.json.backup'", "debug")
-	vconfig_path = local.buffer.vconfig_path
-	backupPath = vconfig_path + ".backup"
-	args = ["cp", vconfig_path, backupPath]
-	subprocess.run(args)
-#end define
-
-
 def BackupMconfig(local):
 	local.add_log("Backup mytoncore config file 'mytoncore.db' to 'mytoncore.db.backup'", "debug")
 	mconfig_path = local.buffer.mconfig_path

mytoninstaller/mytoninstaller.py

@@ -34,7 +34,6 @@
 )
 from mytoninstaller.config import (
 	CreateLocalConfig,
-	BackupVconfig,
 	BackupMconfig,
 )
 
@@ -133,16 +132,18 @@ def Status(local, args):
 	node_args = get_node_args()
 	color_print("{cyan}===[ Node arguments ]==={endc}")
 	for key, value in node_args.items():
-		print(f"{key}: {value}")
+		for v in value:
+			print(f"{key}: {v}")
 #end define
 
 
 def set_node_argument(local, args):
 	if len(args) < 1:
-		color_print("{red}Bad args. Usage:{endc} set_node_argument <arg-name> [arg-value] [-d (to delete)]")
+		color_print("{red}Bad args. Usage:{endc} set_node_argument <arg-name> [arg-value] [-d (to delete)].\n"
+					"Examples: 'set_node_argument --archive-ttl 86400' or 'set_node_argument --archive-ttl -d' or 'set_node_argument -M' or 'set_node_argument --add-shard 0:2000000000000000 0:a000000000000000'")
 		return
 	arg_name = args[0]
-	args = [arg_name, args[1] if len(args) > 1 else ""]
+	args = [arg_name, " ".join(args[1:])]
 	script_path = pkg_resources.resource_filename('mytoninstaller.scripts', 'set_node_argument.py')
 	run_as_root(['python3', script_path] + args)
 	color_print("set_node_argument - {green}OK{endc}")
@@ -293,7 +294,6 @@ def General(local, console):
 	FirstNodeSettings(local)
 	EnableValidatorConsole(local)
 	EnableLiteServer(local)
-	BackupVconfig(local)
 	BackupMconfig(local)
 	CreateSymlinks(local)
 	EnableMode(local)

mytoninstaller/node_args.py

@@ -2,8 +2,8 @@
 
 def get_validator_service():
     path = '/etc/systemd/system/validator.service'
-    with open(path, 'r') as f:
-        return f.read()
+    with open(path, 'r') as file:
+        return file.read()
 #end define
 
 
@@ -14,22 +14,19 @@ def get_node_start_command():
             return line.split('=')[1].strip()
 #end define
 
+def get_node_args(start_command: str = None):
+    if start_command is None:
+        start_command = get_node_start_command()
+    #end if
 
-def get_node_args(command: str = None):
-    if command is None:
-        command = get_node_start_command()
-    result = {}
-    key = ''
-    for c in command.split(' ')[1:]:
-        if c.startswith('--') or c.startswith('-'):
-            if key:
-                result[key] = ''
-            key = c
-        elif key:
-            result[key] = c
-            key = ''
-    if key:
-        result[key] = ''
+    result = dict() # {key: [value1, value2]}
+    node_args = start_command.split(' ')[1:]
+    key = None
+    for item in node_args:
+        if item.startswith('-'):
+            key = item
+            result[key] = list()
+        else:
+            result[key].append(item)
     return result
 #end define
-

mytoninstaller/scripts/set_node_argument.py

@@ -11,20 +11,35 @@ def set_node_arg(arg_name: str, arg_value: str = ''):
     """
     assert arg_name.startswith('-'), 'arg_name must start with "-" or "--"'
     service = get_validator_service()
-    command = get_node_start_command()
-    if command.split(' ')[0] != '/usr/bin/ton/validator-engine/validator-engine':
-        raise Exception('Invalid node start command in service file')
-    if command is None:
+    start_command = get_node_start_command()
+    if start_command is None:
         raise Exception('Cannot find node start command in service file')
-    args = get_node_args(command)
+    first_arg = start_command.split(' ')[0]
+    if first_arg != '/usr/bin/ton/validator-engine/validator-engine':
+        raise Exception('Invalid node start command in service file')
+    #end if
+    
+    node_args = get_node_args(start_command)
     if arg_value == '-d':
-        args.pop(arg_name, None)
+        node_args.pop(arg_name, None)
     else:
-        args[arg_name] = arg_value
-    new_command = command.split(' ')[0] + ' ' + ' '.join([f'{k} {v}' for k, v in args.items()])
-    new_service = service.replace(command, new_command)
-    with open('/etc/systemd/system/validator.service', 'w') as f:
-        f.write(new_service)
+        if ' ' in arg_value:
+            node_args[arg_name] = arg_value.split()
+        else:
+            node_args[arg_name] = [arg_value]
+    #end if
+
+    buffer = list()
+    buffer.append(first_arg)
+    for key, value_list in node_args.items():
+        if len(value_list) == 0:
+            buffer.append(f"{key}")
+        for value in value_list:
+            buffer.append(f"{key} {value}")
+    new_start_command = ' '.join(buffer)
+    new_service = service.replace(start_command, new_start_command)
+    with open('/etc/systemd/system/validator.service', 'w') as file:
+        file.write(new_service)
     restart_node()
 #end define
 

mytoninstaller/settings.py

@@ -66,8 +66,15 @@ def FirstNodeSettings(local):
 	# Прописать автозагрузку
 	cpus = psutil.cpu_count() - 1
 	cmd = f"{validatorAppPath} --threads {cpus} --daemonize --global-config {globalConfigPath} --db {ton_db_dir} --logname {tonLogPath} --archive-ttl {archive_ttl} --verbosity 1"
+
 	add2systemd(name="validator", user=vuser, start=cmd, pre='/bin/sleep 2') # post="/usr/bin/python3 /usr/src/mytonctrl/mytoncore.py -e \"validator down\""
 
+	if os.getenv('ADD_SHARD'):
+		add_shard = os.getenv('ADD_SHARD')
+		cmd += f' -M'
+		for shard in add_shard.split():
+			cmd += f' --add-shard {shard}'
+
 	# Получить внешний ip адрес
 	ip = get_own_ip()
 	vport = random.randint(2000, 65000)

scripts/install.py

@@ -38,6 +38,13 @@ def run_cli():
             "dump",
             message="Do you want to download blockchain's dump? "
                     "This reduces synchronization time but requires to download a large file",
+        ),
+        inquirer.Text(
+            "add-shard",
+            message="Set shards node will sync. Skip to sync all shards. "
+                    "Format: <workchain>:<shard>. Divide multiple shards with space. "
+                    "Example: `0:2000000000000000 0:6000000000000000`",
+            validate=lambda _, x: not x or all([":" in i for i in x.split()])
         )
     ]
 
@@ -51,6 +58,7 @@ def parse_args(answers: dict):
     network = answers["network"].lower()
     config = answers["config"]
     archive_ttl = answers["archive-ttl"]
+    add_shard = answers["add-shard"]
     validator_mode = answers["validator-mode"]
     dump = answers["dump"]
 
@@ -61,6 +69,8 @@ def parse_args(answers: dict):
 
     if archive_ttl:
         os.putenv('ARCHIVE_TTL', archive_ttl)  # set env variable
+    if add_shard:
+        os.putenv('ADD_SHARD', add_shard)
 
     if validator_mode and validator_mode not in ('Skip', 'Validator wallet'):
         if validator_mode == 'Nominator pool':