add node ip address to status if node is remote

Author: yungwine

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
 

mytoncore/mytoncore.py

@@ -3819,13 +3819,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)

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)

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}",

mytoninstaller/mytoninstaller.py

@@ -302,12 +302,6 @@ def General(local, console):
 #end define
 
 
-"""
-Node server: Mtc is being installed and configures node, creates backup but does not create mytoncore service.
-Mtc server: TON bins and Mtc are being installed, restores keys and mytoncore db from backup (in case validator on Node server was installed before), creates mytoncore service.
-"""
-
-
 ###
 ### Start of the program
 ###