Merge pull request #461 from ton-blockchain/dev

Author: yungwine

modules/alert_bot.py

@@ -279,6 +279,7 @@ def setup_alert_bot(self, args):
             self.send_welcome_message()
             self.ton.local.db['BotToken'] = args[0]
             self.ton.local.db['ChatId'] = args[1]
+            self.ton.local.save()
             color_print("setup_alert_bot - {green}OK{endc}")
         except Exception as e:
             self.local.add_log(f"Error while sending welcome message: {e}", "error")
@@ -322,7 +323,7 @@ def check_validator_wallet_balance(self):
             return
         validator_wallet = self.ton.GetValidatorWallet()
         validator_account = self.ton.GetAccount(validator_wallet.addrB64)
-        if validator_account.balance < 10:
+        if validator_account.status != "empty" and validator_account.balance < 10:
             self.send_alert("low_wallet_balance", wallet=validator_wallet.addrB64, balance=validator_account.balance)
 
     def check_efficiency(self):

mytoncore/functions.py

@@ -458,6 +458,7 @@ def Telemetry(local, ton):
     data["vprocess"] = GetValidatorProcessInfo()
     data["dbStats"] = local.try_function(get_db_stats)
     data["nodeArgs"] = local.try_function(get_node_args)
+    data["modes"] = local.try_function(ton.get_modes)
     data["cpuInfo"] = {'cpuName': local.try_function(get_cpu_name), 'virtual': local.try_function(is_host_virtual)}
     data["validatorDiskName"] = local.try_function(get_validator_disk_name)
     data["pings"] = local.try_function(get_pings_values)

mytoncore/liteclient.py

@@ -22,7 +22,7 @@ def Run(self, cmd, **kwargs):
 		if index is not None:
 			index = str(index)
 			args += ["-i", index]
-		elif useLocalLiteServer and self.pubkeyPath and validator_status.out_of_sync and validator_status.out_of_sync < 20:
+		elif useLocalLiteServer and self.pubkeyPath and validator_status.out_of_sync is not None and validator_status.out_of_sync < 20:
 			args = [self.appPath, "--addr", self.addr, "--pub", self.pubkeyPath, "--verbosity", "0", "--cmd", cmd]
 		else:
 			liteServers = self.local.db.get("liteServers")

mytoncore/mytoncore.py

@@ -178,6 +178,7 @@ def GetSeqno(self, wallet):
 		seqno = seqno.replace(' ', '')
 		seqno = parse(seqno, '[', ']')
 		seqno = int(seqno)
+		self.local.add_log(f"GetSeqno: seqno is {seqno}", "debug")
 		return seqno
 	#end define
 
@@ -2384,9 +2385,8 @@ def get_valid_complaints(self, complaints: dict, election_id: int):
 				self.local.add_log(f"complaint {complaint['hash_hex']} declined: complaint info was not found, probably it's wrong", "info")
 				continue
 
-			if (vload["id"] >= config32['mainValidators'] and
-				vload["masterBlocksCreated"] + vload["workBlocksCreated"] > 0):
-				self.local.add_log(f"complaint {complaint['hash_hex']} declined: complaint created for non masterchain validator that created more than zero blocks", "info")
+			if vload["id"] >= config32['mainValidators']:
+				self.local.add_log(f"complaint {complaint['hash_hex']} declined: complaint created for non masterchain validator", "info")
 				continue
 
 			# check complaint fine value
@@ -2587,7 +2587,7 @@ def CheckValidators(self, start, end):
 			pseudohash = pubkey + str(electionId)
 			if pseudohash in valid_complaints or pseudohash in voted_complaints_pseudohashes:  # do not create complaints that already created or voted by ourself
 				continue
-			if item['id'] >= config['mainValidators'] and item["masterBlocksCreated"] + item["workBlocksCreated"] > 0:  # create complaints for non-masterchain validators only if they created 0 blocks
+			if item['id'] >= config['mainValidators']:  # do not create complaints for non-masterchain validators
 				continue
 			# Create complaint
 			fileName = self.remove_proofs_from_complaint(fileName)

mytoncore/utils.py

@@ -100,4 +100,4 @@ def parse_db_stats(path: str):
 # end define
 
 def get_hostname():
-    return subprocess.run(["hostname", "-f"], stdout=subprocess.PIPE).stdout.decode().strip()
+    return subprocess.run(["hostname"], stdout=subprocess.PIPE).stdout.decode().strip()

mytonctrl/mytonctrl.py

@@ -348,6 +348,17 @@ def Upgrade(ton, args):
 		validatorConsole["pubKeyPath"] = "/var/ton-work/keys/server.pub"
 	ton.SetSettings("validatorConsole", validatorConsole)
 
+	clang_version = get_clang_major_version()
+	if clang_version is None or clang_version < 16:
+		text = "{yellow}Warning: clang version 16 or higher is required for TON Node software upgrade.{endc}\n"
+		if clang_version is None:
+			text += "Could not check clang version.\n If you are sure that clang version is 16 or higher, use --force option.\n"
+		text += "For clang update check the following instructions: https://gist.github.com/neodix42/e4b1b68d2d5dd3dec75b5221657f05d7\n"
+		color_print(text)
+		if input("Continue with upgrade anyway? [Y/n]\n").strip().lower() not in ('y', ''):
+			print('aborted.')
+			return
+
 	# Run script
 	upgrade_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/upgrade.sh')
 	runArgs = ["bash", upgrade_script_path, "-a", author, "-r", repo, "-b", branch]
@@ -359,6 +370,36 @@ def Upgrade(ton, args):
 	color_print(text)
 #end define
 
+def get_clang_major_version():
+	try:
+		process = subprocess.run(["clang", "--version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+								 text=True, timeout=3)
+		if process.returncode != 0:
+			return None
+
+		output = process.stdout
+
+		lines = output.strip().split('\n')
+		if not lines:
+			return None
+
+		first_line = lines[0]
+		if "clang version" not in first_line:
+			return None
+
+		version_part = first_line.split("clang version")[1].strip()
+		major_version = version_part.split('.')[0]
+
+		major_version = ''.join(c for c in major_version if c.isdigit())
+
+		if not major_version:
+			return None
+
+		return int(major_version)
+	except Exception as e:
+		print(f"Error checking clang version: {type(e)}: {e}")
+		return None
+
 def rollback_to_mtc1(local, ton,  args):
 	color_print("{red}Warning: this is dangerous, please make sure you've backed up mytoncore's db.{endc}")
 	a = input("Do you want to continue? [Y/n]\n")

mytonctrl/scripts/upgrade.sh

@@ -89,7 +89,7 @@ memory=$(cat /proc/meminfo | grep MemAvailable | awk '{print $2}')
 cpuNumber=$(cat /proc/cpuinfo | grep "processor" | wc -l)
 
 cmake -DCMAKE_BUILD_TYPE=Release ${srcdir}/${repo} -GNinja -DTON_USE_JEMALLOC=ON -DOPENSSL_FOUND=1 -DOPENSSL_INCLUDE_DIR=$opensslPath/include -DOPENSSL_CRYPTO_LIBRARY=$opensslPath/libcrypto.a
-ninja -j ${cpuNumber} fift validator-engine lite-client pow-miner validator-engine-console generate-random-id dht-server func tonlibjson rldp-http-proxy
+ninja -j ${cpuNumber} fift validator-engine lite-client validator-engine-console generate-random-id dht-server func tonlibjson rldp-http-proxy
 systemctl restart validator
 
 # Конец