Merge remote-tracking branch 'origin/mytonctrl2_dev' into mytonctrl2_dev

Author: yungwine

mytoncore/liteclient.py

@@ -17,13 +17,12 @@ def Run(self, cmd, **kwargs):
 		liteclient_timeout = self.local.db.liteclient_timeout if self.local.db.liteclient_timeout else 3
 		timeout = kwargs.get("timeout", liteclient_timeout)
 		useLocalLiteServer = kwargs.get("useLocalLiteServer", True)
-		validatorStatus = self.ton.GetValidatorStatus()
-		validatorOutOfSync = validatorStatus.get("outOfSync")
+		validator_status = self.ton.GetValidatorStatus()
 		args = [self.appPath, "--global-config", self.configPath, "--verbosity", "0", "--cmd", cmd]
 		if index is not None:
 			index = str(index)
 			args += ["-i", index]
-		elif useLocalLiteServer and self.pubkeyPath and validatorOutOfSync < 20:
+		elif useLocalLiteServer and self.pubkeyPath and validator_status.out_of_sync 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

@@ -810,42 +810,48 @@ def GetShardsNumber(self, block=None):
 
 	def GetValidatorStatus(self):
 		# Get buffer
-		bname = "validatorStatus"
+		bname = "validator_status"
 		buff = self.GetFunctionBuffer(bname)
 		if buff:
 			return buff
 		#end if
 
 		self.local.add_log("start GetValidatorStatus function", "debug")
-		validatorStatus = dict()
+		status = Dict()
 		try:
-			validatorStatus["isWorking"] = True
+			# Parse
+			status.is_working = True
 			result = self.validatorConsole.Run("getstats")
-			validatorStatus["unixtime"] = int(parse(result, "unixtime", '\n'))
-			validatorStatus["masterchainblocktime"] = int(parse(result, "masterchainblocktime", '\n'))
-			validatorStatus["stateserializermasterchainseqno"] = int(parse(result, "stateserializermasterchainseqno", '\n'))
-			validatorStatus["shardclientmasterchainseqno"] = int(parse(result, "shardclientmasterchainseqno", '\n'))
+			status.unixtime = int(parse(result, "unixtime", '\n'))
+			status.masterchainblocktime = int(parse(result, "masterchainblocktime", '\n'))
+			status.stateserializermasterchainseqno = int(parse(result, "stateserializermasterchainseqno", '\n'))
+			status.shardclientmasterchainseqno = int(parse(result, "shardclientmasterchainseqno", '\n'))
 			buff = parse(result, "masterchainblock", '\n')
-			validatorStatus["masterchainblock"] = self.GVS_GetItemFromBuff(buff)
+			status.masterchainblock = self.GVS_GetItemFromBuff(buff)
 			buff = parse(result, "gcmasterchainblock", '\n')
-			validatorStatus["gcmasterchainblock"] = self.GVS_GetItemFromBuff(buff)
+			status.gcmasterchainblock = self.GVS_GetItemFromBuff(buff)
 			buff = parse(result, "keymasterchainblock", '\n')
-			validatorStatus["keymasterchainblock"] = self.GVS_GetItemFromBuff(buff)
+			status.keymasterchainblock = self.GVS_GetItemFromBuff(buff)
 			buff = parse(result, "rotatemasterchainblock", '\n')
-			validatorStatus["rotatemasterchainblock"] = self.GVS_GetItemFromBuff(buff)
-			validatorStatus["transNum"] = self.local.buffer.get("transNum", -1)
-			validatorStatus["blocksNum"] = self.local.buffer.get("blocksNum", -1)
-			validatorStatus["masterBlocksNum"] = self.local.buffer.get("masterBlocksNum", -1)
+			status.rotatemasterchainblock = self.GVS_GetItemFromBuff(buff)
+			# Calculate
+			status.masterchain_out_of_sync = status.unixtime - status.masterchainblocktime
+			status.shardchain_out_of_sync = status.masterchainblock - status.shardclientmasterchainseqno
+			status.masterchain_out_of_ser = status.masterchainblock - status.stateserializermasterchainseqno
+			status.out_of_sync = status.masterchain_out_of_sync if status.masterchain_out_of_sync > status.shardchain_out_of_sync else status.shardchain_out_of_sync
+			status.out_of_ser = status.masterchain_out_of_ser
 		except Exception as ex:
 			self.local.add_log(f"GetValidatorStatus warning: {ex}", "warning")
-			validatorStatus["isWorking"] = False
-			validatorStatus["unixtime"] = get_timestamp()
-			validatorStatus["masterchainblocktime"] = 0
-		validatorStatus["outOfSync"] = validatorStatus["unixtime"] - validatorStatus["masterchainblocktime"]
+			status.is_working = False
+		#end try
+
+		# old vars
+		status.outOfSync = status.out_of_sync
+		status.isWorking = status.is_working
 
 		# Set buffer
-		self.SetFunctionBuffer(bname, validatorStatus)
-		return validatorStatus
+		self.SetFunctionBuffer(bname, status)
+		return status
 	#end define
 
 	def GVS_GetItemFromBuff(self, buff):
@@ -2087,8 +2093,8 @@ def GetOffers(self):
 
 			# Create dict
 			# parser from: https://github.com/ton-blockchain/ton/blob/dab7ee3f9794db5a6d32c895dbc2564f681d9126/crypto/smartcont/config-code.fc#L607
-			item = dict()
-			item["config"] = dict()
+			item = Dict()
+			item["config"] = Dict()
 			item["hash"] = hash
 			item["endTime"] = subdata[0] # *expires*
 			item["critFlag"] = subdata[1] # *critical*
@@ -2349,12 +2355,12 @@ def VoteOffer(self, offerHash):
 		if validatorIndex in offer.get("votedValidators"):
 			self.local.add_log("Proposal already has been voted", "debug")
 			return
+		self.add_save_offer(offer)
 		var1 = self.CreateConfigProposalRequest(offerHash, validatorIndex)
 		validatorSignature = self.GetValidatorSignature(validatorKey, var1)
 		resultFilePath = self.SignProposalVoteRequestWithValidator(offerHash, validatorIndex, validatorPubkey_b64, validatorSignature)
 		resultFilePath = self.SignBocWithWallet(wallet, resultFilePath, fullConfigAddr, 1.5)
 		self.SendFile(resultFilePath, wallet)
-		self.add_save_offer(offer)
 	#end define
 
 	def VoteComplaint(self, electionId, complaintHash):

mytonctrl/mytonctrl.py

@@ -597,7 +597,7 @@ def PrintTonStatus(local, startWorkTime, totalValidators, onlineValidators, shar
 	print()
 #end define
 
-def PrintLocalStatus(local, adnlAddr, validatorIndex, validatorEfficiency, validatorWallet, validatorAccount, validatorStatus, dbSize, dbUsage, memoryInfo, swapInfo, netLoadAvg, disksLoadAvg, disksLoadPercentAvg):
+def PrintLocalStatus(local, adnlAddr, validatorIndex, validatorEfficiency, validatorWallet, validatorAccount, validator_status, dbSize, dbUsage, memoryInfo, swapInfo, netLoadAvg, disksLoadAvg, disksLoadPercentAvg):
 	if validatorWallet is None:
 		return
 	walletAddr = validatorWallet.addrB64
@@ -610,7 +610,6 @@ def PrintLocalStatus(local, adnlAddr, validatorIndex, validatorEfficiency, valid
 	netLoad1 = netLoadAvg[0]
 	netLoad5 = netLoadAvg[1]
 	netLoad15 = netLoadAvg[2]
-	validatorOutOfSync = validatorStatus.get("outOfSync")
 
 	validatorIndex_text = GetColorInt(validatorIndex, 0, logic="more")
 	validatorIndex_text = local.translate("local_status_validator_index").format(validatorIndex_text)
@@ -671,11 +670,12 @@ def PrintLocalStatus(local, adnlAddr, validatorIndex, validatorEfficiency, valid
 	validatorUptime = get_service_uptime("validator")
 	mytoncoreUptime_text = bcolors.green_text(time2human(mytoncoreUptime))
 	validatorUptime_text = bcolors.green_text(time2human(validatorUptime))
-	mytoncoreStatus = GetColorStatus(mytoncoreStatus_bool)
-	validatorStatus = GetColorStatus(validatorStatus_bool)
-	mytoncoreStatus_text = local.translate("local_status_mytoncore_status").format(mytoncoreStatus, mytoncoreUptime_text)
-	validatorStatus_text = local.translate("local_status_validator_status").format(validatorStatus, validatorUptime_text)
-	validatorOutOfSync_text = local.translate("local_status_validator_out_of_sync").format(GetColorInt(validatorOutOfSync, 20, logic="less", ending=" s"))
+	mytoncoreStatus_color = GetColorStatus(mytoncoreStatus_bool)
+	validatorStatus_color = GetColorStatus(validatorStatus_bool)
+	mytoncoreStatus_text = local.translate("local_status_mytoncore_status").format(mytoncoreStatus_color, mytoncoreUptime_text)
+	validatorStatus_text = local.translate("local_status_validator_status").format(validatorStatus_color, validatorUptime_text)
+	validator_out_of_sync_text = local.translate("local_status_validator_out_of_sync").format(GetColorInt(validator_status.out_of_sync, 20, logic="less", ending=" s"))
+	validator_out_of_ser_text = local.translate("local_status_validator_out_of_ser").format(GetColorInt(validator_status.out_of_ser, 20, logic="less", ending=" blocks"))
 	dbSize_text = GetColorInt(dbSize, 1000, logic="less", ending=" Gb")
 	dbUsage_text = GetColorInt(dbUsage, 80, logic="less", ending="%")
 	dbStatus_text = local.translate("local_status_db").format(dbSize_text, dbUsage_text)
@@ -708,7 +708,8 @@ def PrintLocalStatus(local, adnlAddr, validatorIndex, validatorEfficiency, valid
 	print(disksLoad_text)
 	print(mytoncoreStatus_text)
 	print(validatorStatus_text)
-	print(validatorOutOfSync_text)
+	print(validator_out_of_sync_text)
+	print(validator_out_of_ser_text)
 	print(dbStatus_text)
 	print(mtcVersion_text)
 	print(validatorVersion_text)
@@ -717,7 +718,7 @@ def PrintLocalStatus(local, adnlAddr, validatorIndex, validatorEfficiency, valid
 
 def GetColorInt(data, border, logic, ending=None):
 	if data is None:
-		result = bcolors.green_text("n/a")
+		result = "n/a"
 	elif logic == "more":
 		if data >= border:
 			result = bcolors.green_text(data, ending)
@@ -1104,7 +1105,7 @@ def PrintOffersList(ton, args):
 		print(text)
 	else:
 		table = list()
-		table += [["Hash", "Votes", "W/L", "Approved", "Is passed"]]
+		table += [["Hash", "Config", "Votes", "W/L", "Approved", "Is passed"]]
 		for item in data:
 			hash = item.get("hash")
 			votedValidators = len(item.get("votedValidators"))
@@ -1120,7 +1121,7 @@ def PrintOffersList(ton, args):
 				isPassed = bcolors.green_text("true")
 			if isPassed == False:
 				isPassed = bcolors.red_text("false")
-			table += [[hash, votedValidators, wl, approvedPercent_text, isPassed]]
+			table += [[hash, item.config.id, votedValidators, wl, approvedPercent_text, isPassed]]
 		print_table(table)
 #end define
 

mytonctrl/resources/translate.json

@@ -324,6 +324,11 @@
 		"ru": "Рассинхронизация локального валидатора: {0}",
 		"zh_TW": "本地驗證者不同步: {0}"
 	},
+	"local_status_validator_out_of_ser": {
+		"en": "Local validator out of ser: {0}",
+		"ru": "Рассериализация локального валидатора: {0}",
+		"zh_TW": "本地驗證者不同步: {0}"
+	},
 	"local_status_db": {
 		"en": "Local validator database size: {0}, {1}",
 		"ru": "Размер БД локального валидатора: {0}, {1}",