Merge pull request #29 from ton-blockchain/dev

Merge Dev to Btc Teleport

Author: yungwine

mytoncore/functions.py

@@ -318,25 +318,35 @@ def get_ok_error(value: str):
                 data['ls_queries']['error'] = int(k.split(':')[1])
     statistics = local.db.get("statistics", dict())
 
-    if time.time() - int(status.start_time) <= 60:  # was node restart <60 sec ago, resetting node statistics
+    # if time.time() - int(status.start_time) <= 60:  # was node restart <60 sec ago, resetting node statistics
+    #     statistics['node'] = []
+
+    if 'node' not in statistics:
         statistics['node'] = []
 
-    # statistics['node'] = [stats_from_election_id, stats_from_prev_min, stats_now]
+    if statistics['node']:
+        if int(status.start_time) > statistics['node'][-1]['timestamp']:
+            # node was restarted, reset node statistics
+            statistics['node'] = []
+
+    # statistics['node']: [stats_from_election_id, stats_from_prev_min, stats_now]
 
-    election_id = ton.GetConfig34()['startWorkTime']
-    if 'node' not in statistics or len(statistics['node']) == 0:
+    election_id = ton.GetConfig34(no_cache=True)['startWorkTime']
+    if len(statistics['node']) == 0:
         statistics['node'] = [None, data]
     elif len(statistics['node']) < 3:
         statistics['node'].append(data)
-    if len(statistics['node']) == 3:
+    elif len(statistics['node']) == 3:
         if statistics['node'][0] is None:
             if 0 < data['timestamp'] - election_id < 90:
                 statistics['node'][0] = data
         elif statistics['node'][0]['timestamp'] < election_id:
             statistics['node'][0] = data
-        statistics['node'] = statistics.get('node', []) + [data]
-        statistics['node'].pop(1)
+        temp = statistics.get('node', []) + [data]
+        temp.pop(1)
+        statistics['node'] = temp
     local.db["statistics"] = statistics
+    local.save()
 
 
 def ReadTransData(local, scanner):

mytoncore/mytoncore.py

@@ -931,11 +931,11 @@ def GetConfig32(self):
 		return config32
 	#end define
 
-	def GetConfig34(self):
+	def GetConfig34(self, no_cache: bool = False):
 		# Get buffer
 		bname = "config34"
-		buff = self.GetFunctionBuffer(bname, timeout=60)
-		if buff:
+		buff = self.GetFunctionBuffer(bname, timeout=10)
+		if buff and not no_cache:
 			return buff
 		#end if
 
@@ -3062,17 +3062,17 @@ def get_node_statistics(self):
 		stats = self.local.db.get('statistics', {}).get('node')
 		result = {}
 		if stats is not None and len(stats) == 3 and stats[0] is not None:
-			for k in ['master', 'shard']:
-				result = {
-					'collated': {
-						'ok': 0,
-						'error': 0,
-					},
-					'validated': {
-						'ok': 0,
-						'error': 0,
-					}
+			result = {
+				'collated': {
+					'ok': 0,
+					'error': 0,
+				},
+				'validated': {
+					'ok': 0,
+					'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']
@@ -3089,7 +3089,7 @@ def get_node_statistics(self):
 				result['collated']['error'] += collated_error
 				result['validated']['ok'] += validated_ok
 				result['validated']['error'] += validated_error
-		if stats is not None and len(stats) >= 2 and stats[0] is not None:
+		if stats is not None and len(stats) >= 2 and stats[-2] is not None and stats[-1] is not None:
 			result['ls_queries'] = {
 				'ok': stats[-1]['ls_queries']['ok'] - stats[-2]['ls_queries']['ok'],
 				'error': stats[-1]['ls_queries']['error'] - stats[-2]['ls_queries']['error'],

mytonctrl/mytonctrl.py

@@ -801,23 +801,25 @@ def PrintLocalStatus(local, ton, adnlAddr, validatorIndex, validatorEfficiency,
 
 	active_validator_groups = None
 
-	if ton.using_validator() and validator_status.validator_groups_master and validator_status.validator_groups_shard:
+	if ton.using_validator() and validator_status.validator_groups_master is not None and validator_status.validator_groups_shard is not None:
 		active_validator_groups = local.translate("active_validator_groups").format(validator_status.validator_groups_master, validator_status.validator_groups_shard)
 
 	collated, validated = None, None
 	ls_queries = None
-	if ton.using_validator():
-		node_stats = ton.get_node_statistics()
-		if node_stats and 'collated' in node_stats and 'validated' in node_stats:
-			collated = local.translate('collated_blocks').format(node_stats['collated']['ok'], node_stats['collated']['error'])
-			validated = local.translate('validated_blocks').format(node_stats['validated']['ok'], node_stats['validated']['error'])
-		else:
-			collated = local.translate('collated_blocks').format('collecting data...', 'wait for the next validation round')
-			validated = local.translate('validated_blocks').format('collecting data...', 'wait for the next validation round')
-	if ton.using_liteserver():
-		node_stats = ton.get_node_statistics()
-		if node_stats and 'ls_queries' in node_stats:
-			ls_queries = local.translate('ls_queries').format(node_stats['ls_queries']['time'], node_stats['ls_queries']['ok'], node_stats['ls_queries']['error'])
+	node_stats = local.try_function(ton.get_node_statistics)
+	if node_stats is not None:
+		if ton.using_validator():
+			if 'collated' in node_stats and 'validated' in node_stats:
+				collated = local.translate('collated_blocks').format(node_stats['collated']['ok'], node_stats['collated']['error'])
+				validated = local.translate('validated_blocks').format(node_stats['validated']['ok'], node_stats['validated']['error'])
+			else:
+				collated = local.translate('collated_blocks').format('collecting data...', 'wait for the next validation round')
+				validated = local.translate('validated_blocks').format('collecting data...', 'wait for the next validation round')
+		if ton.using_liteserver():
+			if 'ls_queries' in node_stats:
+				ls_queries = local.translate('ls_queries').format(node_stats['ls_queries']['time'], node_stats['ls_queries']['ok'], node_stats['ls_queries']['error'])
+	else:
+		local.add_log("Failed to get node statistics", "warning")
 
 	dbSize_text = GetColorInt(dbSize, 1000, logic="less", ending=" Gb")
 	dbUsage_text = GetColorInt(dbUsage, 80, logic="less", ending="%")

mytonctrl/scripts/upgrade.sh

@@ -83,7 +83,7 @@ export CCACHE_DISABLE=1
 
 # Update binary
 cd ${bindir}/${repo}
-ls --hide=global.config.json | xargs -d '\n' rm -rf
+ls --hide="*.config.json" | xargs -d '\n' rm -rf
 rm -rf .ninja_*
 memory=$(cat /proc/meminfo | grep MemAvailable | awk '{print $2}')
 cpuNumber=$(cat /proc/cpuinfo | grep "processor" | wc -l)

mytoninstaller/settings.py

@@ -53,6 +53,8 @@ def FirstNodeSettings(local):
 	if os.getenv('STATE_TTL'):
 		state_ttl = int(os.getenv('STATE_TTL'))
 		archive_ttl -= state_ttl
+	if archive_ttl == 0:
+		archive_ttl = 1  # todo: remove this when archive_ttl==0 will be allowed in node
 
 	# Проверить конфигурацию
 	if os.path.isfile(vconfig_path):

scripts/install.py

@@ -206,7 +206,7 @@ def run_install(answers: dict):
         os.environ['ADD_SHARD'] = add_shard
     if archive_blocks:
         os.environ['ARCHIVE_BLOCKS'] = archive_blocks
-        command += ['-v', 'testnet']
+        command += ['-v', 'master']
 
     if validator_mode and validator_mode not in ('Skip', 'Validator wallet'):
         if validator_mode == 'Nominator pool':