Merge branch 'dev' into prometheus

igroman787 · web-flow · commit 1b388e4f099f · 2025-01-27T12:50:30.000+03:00
diff --git a/modules/__init__.py b/modules/__init__.py
@@ -64,6 +64,7 @@ class Setting:
     'auto_backup': Setting('validator', None, 'Make validator backup every election'),
     'auto_backup_path': Setting('validator', '/tmp/mytoncore/auto_backups/', 'Path to store auto-backups'),
     'prometheus_url': Setting('prometheus', None, 'Prometheus pushgateway url'),
+    'onlyNode': Setting(None, None, 'MyTonCtrl will work only for collecting validator telemetry (if `sendTelemetry` is True), without participating in Elections and etc.')
 }
 
 
diff --git a/modules/alert_bot.py b/modules/alert_bot.py
@@ -142,7 +142,7 @@ def init(self):
         from modules.validator import ValidatorModule
         self.validator_module = ValidatorModule(self.ton, self.local)
         self.hostname = get_hostname()
-        self.ip = self.ton.get_validator_engine_ip()
+        self.ip = self.ton.get_node_ip()
         self.set_global_vars()
         self.inited = True
 
diff --git a/modules/backups.py b/modules/backups.py
@@ -27,6 +27,11 @@ def create_tmp_ton_dir(self):
         self.create_keyring(dir_name_db)
         return dir_name
 
+    @staticmethod
+    def run_create_backup(args):
+        backup_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/create_backup.sh')
+        return subprocess.run(["bash", backup_script_path] + args, timeout=5)
+
     def create_backup(self, args):
         if len(args) > 1:
             color_print("{red}Bad args. Usage:{endc} create_backup [filename]")
@@ -35,8 +40,7 @@ def create_backup(self, args):
         command_args = ["-m", self.ton.local.buffer.my_work_dir, "-t", tmp_dir]
         if len(args) == 1:
             command_args += ["-d", args[0]]
-        backup_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/create_backup.sh')
-        process = subprocess.run(["bash", backup_script_path] + command_args, timeout=5)
+        process = self.run_create_backup(command_args)
 
         if process.returncode == 0:
             color_print("create_backup - {green}OK{endc}")
@@ -46,6 +50,11 @@ def create_backup(self, args):
         return process.returncode
     # end define
 
+    @staticmethod
+    def run_restore_backup(args):
+        restore_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/restore_backup.sh')
+        return run_as_root(["bash", restore_script_path] + args)
+
     def restore_backup(self, args):
         if len(args) == 0 or len(args) > 2:
             color_print("{red}Bad args. Usage:{endc} restore_backup <filename> [-y]")
@@ -67,8 +76,7 @@ def restore_backup(self, args):
         ip = str(ip2int(get_own_ip()))
         command_args = ["-m", self.ton.local.buffer.my_work_dir, "-n", args[0], "-i", ip]
 
-        restore_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/restore_backup.sh')
-        if run_as_root(["bash", restore_script_path] + command_args) == 0:
+        if self.run_restore_backup(command_args) == 0:
             color_print("restore_backup - {green}OK{endc}")
             self.local.exit()
         else:
diff --git a/mytoncore/functions.py b/mytoncore/functions.py
@@ -551,8 +551,14 @@ def General(local):
     # scanner.Run()
 
     # Start threads
-    local.start_cycle(Elections, sec=600, args=(local, ton, ))
     local.start_cycle(Statistics, sec=10, args=(local, ))
+    local.start_cycle(Telemetry, sec=60, args=(local, ton, ))
+    local.start_cycle(OverlayTelemetry, sec=7200, args=(local, ton, ))
+    if local.db.get("onlyNode"):  # mytoncore service works only for telemetry
+        thr_sleep()
+        return
+
+    local.start_cycle(Elections, sec=600, args=(local, ton, ))
     local.start_cycle(Offers, sec=600, args=(local, ton, ))
     local.start_cycle(save_past_events, sec=300, args=(local, ton, ))
 
@@ -562,8 +568,6 @@ def General(local):
     local.start_cycle(Complaints, sec=t, args=(local, ton, ))
     local.start_cycle(Slashing, sec=t, args=(local, ton, ))
 
-    local.start_cycle(Telemetry, sec=60, args=(local, ton, ))
-    local.start_cycle(OverlayTelemetry, sec=7200, args=(local, ton, ))
     local.start_cycle(ScanLiteServers, sec=60, args=(local, ton,))
 
     from modules.custom_overlays import CustomOverlayModule
diff --git a/mytoncore/mytoncore.py b/mytoncore/mytoncore.py
@@ -3824,13 +3824,16 @@ def GetNetworkName(self):
 			return "unknown"
 	#end define
 
-	def get_validator_engine_ip(self):
+	def get_node_ip(self):
 		try:
 			config = self.GetValidatorConfig()
 			return int2ip(config['addrs'][0]['ip'])
 		except:
 			return None
 
+	def get_validator_engine_ip(self):
+		return self.validatorConsole.addr.split(':')[0]
+
 	def GetFunctionBuffer(self, name, timeout=10):
 		timestamp = get_timestamp()
 		buff = self.local.buffer.get(name)
diff --git a/mytonctrl/mytonctrl.py b/mytonctrl/mytonctrl.py
@@ -762,6 +762,11 @@ def PrintLocalStatus(local, ton, adnlAddr, validatorIndex, validatorEfficiency,
 	validatorVersion_text = local.translate("local_status_version_validator").format(validatorGitHash_text, validatorGitBranch_text)
 
 	color_print(local.translate("local_status_head"))
+	node_ip = ton.get_validator_engine_ip()
+	is_node_remote = node_ip != '127.0.0.1'
+	if is_node_remote:
+		nodeIpAddr_text = local.translate("node_ip_address").format(node_ip)
+		color_print(nodeIpAddr_text)
 	if ton.using_validator():
 		print(validatorIndex_text)
 		# print(validatorEfficiency_text)
@@ -776,7 +781,8 @@ def PrintLocalStatus(local, ton, adnlAddr, validatorIndex, validatorEfficiency,
 
 	print(disksLoad_text)
 	print(mytoncoreStatus_text)
-	print(validatorStatus_text)
+	if not is_node_remote:
+		print(validatorStatus_text)
 	print(validator_out_of_sync_text)
 	print(validator_out_of_ser_text)
 	print(dbStatus_text)
diff --git a/mytonctrl/resources/translate.json b/mytonctrl/resources/translate.json
@@ -249,6 +249,11 @@
 		"ru": "{cyan}===[ Статус ноды ]==={endc}",
 		"zh_TW": "{cyan}===[ 节点狀態 ]==={endc}"
 	},
+	"node_ip_address": {
+		"en": "Node IP address: {{bold}}{0}{{endc}}",
+		"ru": "IP адрес Ноды: {{bold}}{0}{{endc}}",
+		"zh_TW": "節點 IP 地址: {{bold}}{0}{{endc}}"
+	},
 	"local_status_validator_index": {
 		"en": "Validator index: {0}",
 		"ru": "Индекс валидатора: {0}",
diff --git a/mytonctrl/scripts/restore_backup.sh b/mytonctrl/scripts/restore_backup.sh
@@ -1,13 +1,15 @@
 name="backup.tar.gz"
 mtc_dir="$HOME/.local/share/mytoncore"
 ip=0
+user=$(logname)
 # Get arguments
-while getopts n:m:i: flag
+while getopts n:m:i:u: flag
 do
 	case "${flag}" in
 		n) name=${OPTARG};;
     m) mtc_dir=${OPTARG};;
     i) ip=${OPTARG};;
+    u) user=${OPTARG};;
     *)
         echo "Flag -${flag} is not recognized. Aborting"
         exit 1 ;;
@@ -38,19 +40,28 @@ if [ ! -d ${tmp_dir}/db ]; then
 fi
 
 rm -rf /var/ton-work/db/keyring
-cp -rf ${tmp_dir}/db /var/ton-work
-cp -rf ${tmp_dir}/keys /var/ton-work
-cp -rfT ${tmp_dir}/mytoncore $mtc_dir
+
+chown -R $user:$user ${tmp_dir}/mytoncore
+chown -R $user:$user ${tmp_dir}/keys
+
+cp -rfp ${tmp_dir}/db /var/ton-work
+cp -rfp ${tmp_dir}/keys /var/ton-work
+cp -rfpT ${tmp_dir}/mytoncore $mtc_dir
 
 chown -R validator:validator /var/ton-work/db/keyring
 
 echo -e "${COLOR}[2/4]${ENDC} Extracted files from archive"
 
 rm -r /var/ton-work/db/dht-*
 
-python3 -c "import json;path='/var/ton-work/db/config.json';f=open(path);d=json.load(f);f.close();d['addrs'][0]['ip']=int($ip);f=open(path, 'w');f.write(json.dumps(d, indent=4));f.close()"
+if [ $ip -ne 0 ]; then
+    echo "Replacing IP in node config"
+    python3 -c "import json;path='/var/ton-work/db/config.json';f=open(path);d=json.load(f);f.close();d['addrs'][0]['ip']=int($ip);f=open(path, 'w');f.write(json.dumps(d, indent=4));f.close()"
+else
+    echo "IP is not provided, skipping IP replacement"
+fi
 
-echo -e "${COLOR}[3/4]${ENDC} Deleted DHT files, replaced IP in node config"
+echo -e "${COLOR}[3/4]${ENDC} Deleted DHT files"
 
 systemctl start validator
 systemctl start mytoncore
diff --git a/mytonctrl/scripts/update.sh b/mytonctrl/scripts/update.sh
@@ -12,7 +12,7 @@ author="ton-blockchain"
 repo="mytonctrl"
 branch="master"
 srcdir="/usr/src/"
-bindir="/usr/bin/"
+tmpdir="/tmp/mytonctrl_src/"
 
 # Get arguments
 while getopts a:r:b: flag
@@ -28,16 +28,18 @@ done
 COLOR='\033[92m'
 ENDC='\033[0m'
 
-# Go to work dir
-cd ${srcdir}
+mkdir -p ${tmpdir}
+cd ${tmpdir}
+rm -rf ${tmpdir}/${repo}
+echo "https://github.com/${author}/${repo}.git -> ${branch}"
+git clone --recursive https://github.com/${author}/${repo}.git || exit 1
 
-# uninstall previous version
 rm -rf ${srcdir}/${repo}
 pip3 uninstall -y mytonctrl
 
 # Update code
-echo "https://github.com/${author}/${repo}.git -> ${branch}"
-git clone --recursive https://github.com/${author}/${repo}.git
+cd ${srcdir}
+cp -rf ${tmpdir}/${repo} ${srcdir}
 cd ${repo} && git checkout ${branch}
 pip3 install -U .
 
diff --git a/mytonctrl/scripts/upgrade.sh b/mytonctrl/scripts/upgrade.sh
@@ -13,6 +13,7 @@ repo="ton"
 branch="master"
 srcdir="/usr/src/"
 bindir="/usr/bin/"
+tmpdir="/tmp/ton_src/"
 
 # Get arguments
 while getopts a:r:b: flag
@@ -59,13 +60,18 @@ else
   opensslPath=${bindir}/openssl_3
 fi
 
+rm -rf ${tmpdir}/${repo}
+mkdir -p ${tmpdir}/${repo}
+cd ${tmpdir}/${repo}
+echo "https://github.com/${author}/${repo}.git -> ${branch}"
+git clone --recursive https://github.com/${author}/${repo}.git . || exit 1
+
 # Go to work dir
 cd ${srcdir}/${repo}
 ls -A1 | xargs rm -rf
 
 # Update code
-echo "https://github.com/${author}/${repo}.git -> ${branch}"
-git clone --recursive https://github.com/${author}/${repo}.git .
+cp -rfT ${tmpdir}/${repo} .
 git checkout ${branch}
 
 git submodule sync --recursive
diff --git a/mytoninstaller/config.py b/mytoninstaller/config.py
@@ -44,6 +44,8 @@ def backup_config(local, config_path):
 
 
 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"
diff --git a/mytoninstaller/mytoninstaller.py b/mytoninstaller/mytoninstaller.py
@@ -30,7 +30,7 @@
 	enable_ls_proxy,
 	enable_ton_storage,
 	enable_ton_storage_provider,
-	EnableMode
+	EnableMode, ConfigureFromBackup, ConfigureOnlyNode
 )
 from mytoninstaller.config import (
 	CreateLocalConfig,
@@ -276,6 +276,17 @@ def General(local, console):
 		mx = sys.argv.index("-m")
 		mode = sys.argv[mx+1]
 		local.buffer.mode = mode
+	if "--only-mtc" in sys.argv:
+		ox = sys.argv.index("--only-mtc")
+		local.buffer.only_mtc = str2bool(sys.argv[ox+1])
+	if "--only-node" in sys.argv:
+		ox = sys.argv.index("--only-node")
+		local.buffer.only_node = str2bool(sys.argv[ox+1])
+	if "--backup" in sys.argv:
+		bx = sys.argv.index("--backup")
+		backup = sys.argv[bx+1]
+		if backup != "none":
+			local.buffer.backup = backup
 	#end if
 
 	FirstMytoncoreSettings(local)
@@ -286,6 +297,8 @@ def General(local, console):
 	BackupMconfig(local)
 	CreateSymlinks(local)
 	EnableMode(local)
+	ConfigureFromBackup(local)
+	ConfigureOnlyNode(local)
 #end define
 
 
diff --git a/mytoninstaller/settings.py b/mytoninstaller/settings.py
diff --git a/scripts/install.sh b/scripts/install.sh
diff --git a/scripts/ton_installer.sh b/scripts/ton_installer.sh

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ class Setting:`
`64`	`64`	`'auto_backup': Setting('validator', None, 'Make validator backup every election'),`
`65`	`65`	`'auto_backup_path': Setting('validator', '/tmp/mytoncore/auto_backups/', 'Path to store auto-backups'),`
`66`	`66`	`'prometheus_url': Setting('prometheus', None, 'Prometheus pushgateway url'),`
	`67`	+ 'onlyNode': Setting(None, None, 'MyTonCtrl will work only for collecting validator telemetry (if `sendTelemetry` is True), without participating in Elections and etc.')
`67`	`68`	`}`
`68`	`69`
`69`	`70`