Merge pull request #232 from ton-blockchain/mytonctrl2_dev

merge mytonctrl2_dev into mytonctrl2

Author: igroman787

docs/ru/ton-storage-provider.md

@@ -0,0 +1,32 @@
+# TON storage provider
+
+MyTonCtrl поддерживает установку дополнительных компонентов таких как `TON storage` и `TON storage provider`. С их помощью вы можете хранить пользовательские файлы у себя на сервере и получать за это вознаграждение.
+
+## Установка дополнительных компонентов
+
+Войдите в MyTonCtrl
+```
+mytonctrl
+```
+
+Затем войдите в режим установщика
+```
+installer
+```
+
+После включите нужный функционал TON storage provider:
+```
+enable TSP
+```
+
+## Активация контракта провайдера
+
+В ходе установки дополнительных компонетов был создан специальный кошелек провайдера `provider_wallet_001` откуда будут отправляться доказательства и куда будет приходить награда.
+Для его работы сначала нужно пополнить этот кошелек на 1 монету и активировать его командой внутри MyTonCtrl, в ходе которого он так же зарегистрируется в списке провайдеров:
+```
+activate_ton_storage_provider
+```
+
+## Панель управления TON storage provider
+
+TODO

modules/nominator_pool.py

@@ -7,6 +7,37 @@
 
 class NominatorPoolModule(PoolModule):
 
+    def do_create_pool(self, pool_name, validator_reward_share_percent, max_nominators_count, min_validator_stake,
+                       min_nominator_stake):
+        self.ton.local.add_log("start CreatePool function", "debug")
+        validator_reward_share = int(validator_reward_share_percent * 100)
+
+        self.check_download_pool_contract_scripts()
+
+        file_path = self.ton.poolsDir + pool_name
+        if os.path.isfile(file_path + ".addr"):
+            self.ton.local.add_log("CreatePool warning: Pool already exists: " + file_path, "warning")
+            return
+        # end if
+
+        fift_script = self.ton.contractsDir + "nominator-pool/func/new-pool.fif"
+        wallet = self.ton.GetValidatorWallet()
+        args = [fift_script, wallet.addrB64, validator_reward_share, max_nominators_count, min_validator_stake,
+                min_nominator_stake, file_path]
+        result = self.ton.fift.Run(args)
+        if "Saved pool" not in result:
+            raise Exception("CreatePool error: " + result)
+        # end if
+
+        pools = self.ton.GetPools()
+        new_pool = self.ton.GetLocalPool(pool_name)
+        for pool in pools:
+            if pool.name != new_pool.name and pool.addrB64 == new_pool.addrB64:
+                new_pool.Delete()
+                raise Exception("CreatePool error: Pool with the same parameters already exists.")
+        # end for
+    # end define
+
     def new_pool(self, args):
         try:
             pool_name = args[0]
@@ -17,7 +48,7 @@ def new_pool(self, args):
         except:
             color_print("{red}Bad args. Usage:{endc} new_pool <pool-name> <validator-reward-share-percent> <max-nominators-count> <min-validator-stake> <min-nominator-stake>")
             return
-        self.ton.CreatePool(pool_name, validator_reward_share_percent, max_nominators_count, min_validator_stake, min_nominator_stake)
+        self.do_create_pool(pool_name, validator_reward_share_percent, max_nominators_count, min_validator_stake, min_nominator_stake)
         color_print("NewPool - {green}OK{endc}")
 
     def do_activate_pool(self, pool, ex=True):

modules/pool.py

@@ -1,3 +1,5 @@
+import os
+
 from mypylib.mypylib import color_print, print_table
 from modules.module import MtcModule
 
@@ -28,6 +30,15 @@ def delete_pool(self, args):
         pool = self.ton.GetLocalPool(pool_name)
         pool.Delete()
         color_print("DeletePool - {green}OK{endc}")
+    # end define
+
+    def do_import_pool(self, pool_name, addr_b64):
+        self.check_download_pool_contract_scripts()
+        addr_bytes = self.ton.addr_b64_to_bytes(addr_b64)
+        pool_path = self.ton.poolsDir + pool_name
+        with open(pool_path + ".addr", 'wb') as file:
+            file.write(addr_bytes)
+    # end define
 
     def import_pool(self, args):
         try:
@@ -36,9 +47,14 @@ def import_pool(self, args):
         except:
             color_print("{red}Bad args. Usage:{endc} import_pool <pool-name> <pool-addr>")
             return
-        self.ton.import_pool(pool_name, pool_addr)
+        self.do_import_pool(pool_name, pool_addr)
         color_print("import_pool - {green}OK{endc}")
 
+    def check_download_pool_contract_scripts(self):
+        contract_path = self.ton.contractsDir + "nominator-pool/"
+        if not os.path.isdir(contract_path):
+            self.ton.DownloadContract("https://github.com/ton-blockchain/nominator-pool")
+
     def add_console_commands(self, console):
         console.AddItem("pools_list", self.print_pools_list, self.local.translate("pools_list_cmd"))
         console.AddItem("delete_pool", self.delete_pool, self.local.translate("delete_pool_cmd"))

modules/single_pool.py

@@ -11,6 +11,8 @@ class SingleNominatorModule(PoolModule):
     def do_create_single_pool(self, pool_name, owner_address):
         self.ton.local.add_log("start create_single_pool function", "debug")
 
+        self.check_download_pool_contract_scripts()
+
         file_path = self.ton.poolsDir + pool_name
         if os.path.isfile(file_path + ".addr"):
             self.ton.local.add_log("create_single_pool warning: Pool already exists: " + file_path, "warning")

mytoncore/functions.py

@@ -5,11 +5,13 @@
 import psutil
 import time
 import json
+import base64
 import requests
 import subprocess
 
-from mytoncore.mytoncore import MyTonCore, Dec2HexAddr
-from mytoncore.tonblocksscanner import TonBlocksScanner
+from mytoncore.mytoncore import MyTonCore
+from mytoncore.utils import parse_db_stats
+from mytoninstaller.config import GetConfig
 from mypylib.mypylib import (
     b2mb,
     get_timestamp,
@@ -20,14 +22,15 @@
     thr_sleep,
     Dict
 )
+from mytoninstaller.node_args import get_node_args
 
 
 def Init(local):
     # Event reaction
     if ("-e" in sys.argv):
         x = sys.argv.index("-e")
-        eventName = sys.argv[x+1]
-        Event(local, eventName)
+        event_name = sys.argv[x+1]
+        Event(local, event_name)
     # end if
 
     local.run()
@@ -46,11 +49,13 @@ def Init(local):
 # end define
 
 
-def Event(local, eventName):
-    if eventName == "enableVC":
+def Event(local, event_name):
+    if event_name == "enableVC":
         EnableVcEvent(local)
-    elif eventName == "validator down":
+    elif event_name == "validator down":
         ValidatorDownEvent(local)
+    elif event_name == "enable_ton_storage_provider":
+        enable_ton_storage_provider_event(local)
     local.exit()
 # end define
 
@@ -78,6 +83,15 @@ def ValidatorDownEvent(local):
 # end define
 
 
+def enable_ton_storage_provider_event(local):
+    config_path = local.db.ton_storage.provider.config_path
+    config = GetConfig(path=config_path)
+    key_bytes = base64.b64decode(config.ProviderKey)
+    ton = MyTonCore(local)
+    ton.import_wallet_with_version(key_bytes[:32], version="v3r2", wallet_name="provider_wallet_001")
+#end define
+
+
 def Elections(local, ton):
     use_pool = ton.using_pool()
     use_liquid_staking = ton.using_liquid_staking()
@@ -419,6 +433,90 @@ def GetValidatorProcessInfo():
 # end define
 
 
+def get_db_stats():
+    result = {
+        'rocksdb': {
+            'ok': True,
+            'message': '',
+            'data': {}
+        },
+        'celldb': {
+            'ok': True,
+            'message': '',
+            'data': {}
+        },
+    }
+    rocksdb_stats_path = '/var/ton-work/db/db_stats.txt'
+    celldb_stats_path = '/var/ton-work/db/celldb/db_stats.txt'
+    if os.path.exists(rocksdb_stats_path):
+        try:
+            result['rocksdb']['data'] = parse_db_stats(rocksdb_stats_path)
+        except Exception as e:
+            result['rocksdb']['ok'] = False
+            result['rocksdb']['message'] = f'failed to fetch db stats: {e}'
+    else:
+        result['rocksdb']['ok'] = False
+        result['rocksdb']['message'] = 'db stats file is not exists'
+    # end if
+
+    if os.path.exists(celldb_stats_path):
+        try:
+            result['celldb']['data'] = parse_db_stats(celldb_stats_path)
+        except Exception as e:
+            result['celldb']['ok'] = False
+            result['celldb']['message'] = f'failed to fetch db stats: {e}'
+    else:
+        result['celldb']['ok'] = False
+        result['celldb']['message'] = 'db stats file is not exists'
+    # end if
+
+    return result
+# end define
+
+
+def get_cpu_name():
+    with open('/proc/cpuinfo') as f:
+        for line in f:
+            if line.strip():
+                if line.rstrip('\n').startswith('model name'):
+                    return line.rstrip('\n').split(':')[1].strip()
+    return None
+
+
+def is_host_virtual():
+    try:
+        with open('/sys/class/dmi/id/product_name') as f:
+            product_name = f.read().strip().lower()
+            if 'virtual' in product_name or 'kvm' in product_name or 'qemu' in product_name or 'vmware' in product_name:
+                return {'virtual': True, 'product_name': product_name}
+            return {'virtual': False, 'product_name': product_name}
+    except FileNotFoundError:
+        return {'virtual': None, 'product_name': None}
+
+
+def do_beacon_ping(host, count, timeout):
+    args = ['ping', '-c', str(count), '-W', str(timeout), host]
+    process = subprocess.run(args, stdin=subprocess.PIPE,
+                             stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=timeout)
+    output = process.stdout.decode("utf-8")
+    avg = output.split('\n')[-2].split('=')[1].split('/')[1]
+    return float(avg)
+
+
+def get_pings_values():
+    return {
+        'beacon-eu-01.toncenter.com': do_beacon_ping('beacon-eu-01.toncenter.com', 5, 10),
+        'beacon-apac-01.toncenter.com': do_beacon_ping('beacon-apac-01.toncenter.com', 5, 10)
+    }
+
+
+def get_validator_disk_name():
+    process = subprocess.run("df -h /var/ton-work/ | sed -n '2 p' | awk '{print $1}'", stdin=subprocess.PIPE,
+                             stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=3, shell=True)
+    output = process.stdout.decode("utf-8")
+    return output.strip()
+
+
 def Telemetry(local, ton):
     sendTelemetry = local.db.get("sendTelemetry")
     if sendTelemetry is not True:
@@ -442,6 +540,11 @@ def Telemetry(local, ton):
     data["swap"] = GetSwapInfo()
     data["uname"] = GetUname()
     data["vprocess"] = GetValidatorProcessInfo()
+    data["dbStats"] = get_db_stats()
+    data["nodeArgs"] = get_node_args()
+    data["cpuInfo"] = {'cpuName': get_cpu_name(), 'virtual': is_host_virtual()}
+    data["validatorDiskName"] = get_validator_disk_name()
+    data["pings"] = get_pings_values()
     elections = local.try_function(ton.GetElectionEntries)
     complaints = local.try_function(ton.GetComplaints)