add initial sync to mtc

Author: yungwine

mytoncore/functions.py

@@ -544,6 +544,17 @@ def ScanLiteServers(local, ton):
 # end define
 
 
+def check_initial_sync(local, ton):
+    if not ton.in_initial_sync():
+        return
+    validator_status = ton.GetValidatorStatus()
+    if validator_status.initial_sync:
+        return
+    if validator_status.out_of_sync < 20:
+        ton.set_initial_sync_off()
+        return
+
+
 def General(local):
     local.add_log("start General function", "debug")
     ton = MyTonCore(local)
@@ -579,6 +590,9 @@ def General(local):
     from modules.prometheus import PrometheusModule
     local.start_cycle(PrometheusModule(ton, local).push_metrics, sec=30, args=())
 
+    if ton.in_initial_sync():
+        local.start_cycle(check_initial_sync, sec=120, args=(local, ton))
+
     thr_sleep()
 # end define
 

mytoncore/mytoncore.py

@@ -781,6 +781,7 @@ def GetValidatorStatus(self):
 
 		self.local.add_log("start GetValidatorStatus function", "debug")
 		status = Dict()
+		result = None
 		try:
 			# Parse
 			status.is_working = True
@@ -808,7 +809,8 @@ def GetValidatorStatus(self):
 		except Exception as ex:
 			self.local.add_log(f"GetValidatorStatus warning: {ex}", "warning")
 			status.is_working = False
-			self.local.try_function(self.parse_stats_from_vc, args=[result, status])
+			if result is not None:
+				self.local.try_function(self.parse_stats_from_vc, args=[result, status])
 		#end try
 		status.initial_sync = status.get("process.initial_sync")
 
@@ -3137,6 +3139,13 @@ def using_alert_bot(self):
 	def using_prometheus(self):
 		return self.get_mode_value('prometheus')
 
+	def in_initial_sync(self):
+		return self.local.db.get('initialSync', False)
+
+	def set_initial_sync_off(self):
+		self.local.db.pop('initialSync', None)
+		self.local.save()
+
 	def Tlb2Json(self, text):
 		# Заменить скобки
 		start = 0

mytonctrl/mytonctrl.py

@@ -440,7 +440,7 @@ def check_disk_usage(local, ton):
 
 def check_sync(local, ton):
 	validator_status = ton.GetValidatorStatus()
-	if validator_status.initial_sync:
+	if validator_status.initial_sync or ton.in_initial_sync():
 		print_warning(local, "initial_sync_warning")
 		return
 	if not validator_status.is_working or validator_status.out_of_sync >= 20:
@@ -733,12 +733,18 @@ def PrintLocalStatus(local, ton, adnlAddr, validatorIndex, validatorEfficiency,
 	validatorStatus_text = local.translate("local_status_validator_status").format(validatorStatus_color, validatorUptime_text)
 
 	validator_initial_sync_text = ''
+	validator_out_of_sync_text = ''
 
 	if validator_status.initial_sync:
 		validator_initial_sync_text = local.translate("local_status_validator_initial_sync").format(validator_status['process.initial_sync'])
-	validator_out_of_sync_text = local.translate("local_status_validator_out_of_sync").format(GetColorInt(validator_status.out_of_sync, 20, logic="less"))
-	master_out_of_sync_text = local.translate("local_status_master_out_of_sync").format(GetColorInt(validator_status.masterchain_out_of_sync, 20, logic="less", ending=" sec"))
-	shard_out_of_sync_text = local.translate("local_status_shard_out_of_sync").format(GetColorInt(validator_status.shardchain_out_of_sync, 5, logic="less", ending=" blocks"))
+	elif ton.in_initial_sync():  # states have been downloaded, now downloading blocks
+		validator_initial_sync_text = local.translate("local_status_validator_initial_sync").format(
+			f'Syncing blocks, last known block was {validator_status.out_of_sync} s ago'
+		)
+	else:
+		validator_out_of_sync_text = local.translate("local_status_validator_out_of_sync").format(GetColorInt(validator_status.out_of_sync, 20, logic="less"))
+		master_out_of_sync_text = local.translate("local_status_master_out_of_sync").format(GetColorInt(validator_status.masterchain_out_of_sync, 20, logic="less", ending=" sec"))
+		shard_out_of_sync_text = local.translate("local_status_shard_out_of_sync").format(GetColorInt(validator_status.shardchain_out_of_sync, 5, logic="less", ending=" blocks"))
 
 	validator_out_of_ser_text = local.translate("local_status_validator_out_of_ser").format(f'{validator_status.out_of_ser} blocks ago')
 
@@ -785,11 +791,12 @@ def PrintLocalStatus(local, ton, adnlAddr, validatorIndex, validatorEfficiency,
 	print(mytoncoreStatus_text)
 	if not is_node_remote:
 		print(validatorStatus_text)
-	if validator_status.initial_sync:
+	if validator_initial_sync_text:
 		print(validator_initial_sync_text)
-	print(validator_out_of_sync_text)
-	print(master_out_of_sync_text)
-	print(shard_out_of_sync_text)
+	if validator_out_of_sync_text:
+		print(validator_out_of_sync_text)
+		print(master_out_of_sync_text)
+		print(shard_out_of_sync_text)
 	print(validator_out_of_ser_text)
 	print(dbStatus_text)
 	print(mtcVersion_text)

mytoninstaller/settings.py

@@ -206,6 +206,8 @@ def FirstMytoncoreSettings(local):
 	# Telemetry
 	mconfig.sendTelemetry = local.buffer.telemetry
 
+	mconfig.initialSync = True
+
 	# Записать настройки в файл
 	SetConfig(path=mconfig_path, data=mconfig)