Merge remote-tracking branch 'tonblkch/dev' into 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")

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
 

mytonctrl/mytonctrl.py

@@ -345,11 +345,6 @@ def Update(local, args):
 #end define
 
 def Upgrade(ton, args):
-	force = False
-	if '--force' in args:
-		force = True
-		args.remove('--force')
-
 	repo = "ton"
 	author, repo, branch = check_git(args, repo, "upgrade")
 
@@ -372,13 +367,15 @@ def Upgrade(ton, args):
 	ton.SetSettings("validatorConsole", validatorConsole)
 
 	clang_version = get_clang_major_version()
-	if (clang_version is None or clang_version < 16) and not force:
-		text = "{red}Error: clang version 16 or higher is required for TON Node software upgrade.{endc}\n"
+	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"
+		text += "For clang update check the following instructions: https://gist.github.com/neodix42/e4b1b68d2d5dd3dec75b5221657f05d7\n"
 		color_print(text)
-		return
+		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')
@@ -417,7 +414,8 @@ def get_clang_major_version():
 			return None
 
 		return int(major_version)
-	except Exception:
+	except Exception as e:
+		print(f"Error checking clang version: {type(e)}: {e}")
 		return None
 
 def rollback_to_mtc1(local, ton,  args):