add collated and validated blocks stats

Author: yungwine

mytoncore/functions.py

@@ -286,6 +286,56 @@ def CalculateNetworkStatistics(zerodata, data):
 # end define
 
 
+def save_node_statistics(local, ton):
+    status = ton.GetValidatorStatus()
+    if status.unixtime is None:
+        return
+    data = {'timestamp': status.unixtime}
+
+    def get_ok_error(value: str):
+        ok, error = value.split()
+        return int(ok.split(':')[1]), int(error.split(':')[1])
+
+    if 'total.collated_blocks.master' in status:
+        master_ok, master_error = get_ok_error(status['total.collated_blocks.master'])
+        shard_ok, shard_error = get_ok_error(status['total.collated_blocks.shard'])
+        data['collated_blocks'] = {
+            'master': {'ok': master_ok, 'error': master_error},
+            'shard': {'ok': shard_ok, 'error': shard_error},
+        }
+    if 'total.validated_blocks.master' in status:
+        master_ok, master_error = get_ok_error(status['total.validated_blocks.master'])
+        shard_ok, shard_error = get_ok_error(status['total.validated_blocks.shard'])
+        data['validated_blocks'] = {
+            'master': {'ok': master_ok, 'error': master_error},
+            'shard': {'ok': shard_ok, 'error': shard_error},
+        }
+    if 'total.ext_msg_check' in status:
+        ok, error = get_ok_error(status['total.ext_msg_check'])
+        data['ext_msg_check'] = {'ok': ok, 'error': error}
+    if 'total.ls_queries_ok' in status and 'total.ls_queries_error' in status:
+        data['ls_queries'] = {}
+        for k in status['total.ls_queries_ok']:
+            if k.startswith('TOTAL'):
+                data['ls_queries']['ok'] = k.split(':')[1]
+        for k in status['total.ls_queries_error']:
+            if k.startswith('TOTAL'):
+                data['ls_queries']['error'] = k.split(':')[1]
+    statistics = local.db.get("statistics", dict())
+
+    # statistics['node'] = [stats_from_election_id, stats_from_prev_min, stats_now]
+
+    election_id = ton.GetConfig32()['startWorkTime']
+    if 'node' not in statistics or len(statistics['node']) < 1:
+        statistics['node'] = [data]
+    elif statistics['node'][0]['timestamp'] < election_id:
+        statistics['node'] = [data, data]
+    else:
+        statistics['node'] = statistics.get('node', []) + [data]
+        statistics['node'].pop(1)
+    local.db["statistics"] = statistics
+
+
 def ReadTransData(local, scanner):
     transData = local.buffer.transData
     SetToTimeData(transData, scanner.transNum)
@@ -581,6 +631,8 @@ def General(local):
 
     local.start_cycle(ScanLiteServers, sec=60, args=(local, ton,))
 
+    local.start_cycle(save_node_statistics, sec=60, args=(local, ton, ))
+
     from modules.custom_overlays import CustomOverlayModule
     local.start_cycle(CustomOverlayModule(ton, local).custom_overlays, sec=60, args=())
 

mytonctrl/mytonctrl.py

@@ -751,6 +751,23 @@ def PrintLocalStatus(local, ton, adnlAddr, validatorIndex, validatorEfficiency,
 	if validator_status.stateserializerenabled:
 		validator_out_of_ser_text = local.translate("local_status_validator_out_of_ser").format(f'{validator_status.out_of_ser} blocks ago')
 
+	collated, validated = None, None
+	if ton.using_validator() and validatorIndex != -1:
+		stats = ton.local.db.get('statistics', {}).get('node')
+		if stats is not None and len(stats) == 3:
+			collated_ok = 0
+			collated_error = 0
+			validated_ok = 0
+			validated_error = 0
+			for k in ['master', 'shard']:
+				collated_ok += stats[2]['collated_blocks'][k]['ok'] - stats[0]['collated_blocks'][k]['ok']
+				collated_error += stats[2]['collated_blocks'][k]['error'] - stats[0]['collated_blocks'][k]['error']
+				validated_ok += stats[2]['validated_blocks'][k]['ok'] - stats[0]['validated_blocks'][k]['ok']
+				validated_error += stats[2]['validated_blocks'][k]['error'] - stats[0]['validated_blocks'][k]['error']
+			collated = local.translate['collated_blocks'].format(collated_ok, collated_error)
+			validated = local.translate['validated_blocks'].format(validated_ok, validated_error)
+
+
 	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)
@@ -800,6 +817,9 @@ def PrintLocalStatus(local, ton, adnlAddr, validatorIndex, validatorEfficiency,
 		print(validator_out_of_sync_text)
 		print(master_out_of_sync_text)
 		print(shard_out_of_sync_text)
+	if collated and validated:
+		print(collated)
+		print(validated)
 	if validator_out_of_ser_text:
 		print(validator_out_of_ser_text)
 	print(dbStatus_text)

mytonctrl/resources/translate.json

@@ -344,6 +344,16 @@
 		"ru": "Серализация стейта локального валидатора была: {0}",
 		"zh_TW": "本地驗證者最後一次狀態序列化: {0}"
 	},
+	"collated_blocks": {
+		"en": "Collated blocks since validation round started (success/error): {0}",
+		"ru": "Собранные блоки с начала раунда валидации (успех/ошибка): {0}",
+		"zh_TW": "自驗證週期開始以來的彙編區塊 (成功/錯誤): {0}"
+	},
+	"validated_blocks": {
+		"en": "Validated blocks since validation round started (success/error): {0}",
+		"ru": "Проверенные блоки с начала раунда валидации (успех/ошибка): {0}",
+		"zh_TW": "自驗證週期開始以來的驗證區塊 (成功/錯誤): {0}"
+	},
 	"local_status_db": {
 		"en": "Local validator database size: {0}, {1}",
 		"ru": "Размер БД локального валидатора: {0}, {1}",