add ton_storage_provider

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

mytoncore/functions.py

@@ -5,11 +5,13 @@
 import psutil
 import time
 import json
+import base64
 import requests
 import subprocess
 
 from mytoncore.mytoncore import MyTonCore
 from mytoncore.utils import parse_db_stats
+from mytoninstaller.config import GetConfig
 from mypylib.mypylib import (
     b2mb,
     get_timestamp,
@@ -26,8 +28,8 @@ 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 +48,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 +82,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()

mytoncore/mytoncore.py

@@ -1656,17 +1656,11 @@ def CreateWallet(self, name, workchain=0, version="v1", **kwargs):
 		if os.path.isfile(walletPath + ".pk") and "v3" not in version:
 			self.local.add_log("CreateWallet error: Wallet already exists: " + name, "warning")
 		else:
-			if "v1" in version:
-				fiftScript = "new-wallet.fif"
-				args = [fiftScript, workchain, walletPath]
-			if "v2" in version:
-				fiftScript = "new-wallet-v2.fif"
-				args = [fiftScript, workchain, walletPath]
-			if "v3" in version:
-				fiftScript = "new-wallet-v3.fif"
-				args = [fiftScript, workchain, subwallet, walletPath]
-			result = self.fift.Run(args)
+			fift_args = self.get_new_wallet_fift_args(version, workchain=workchain, 
+				wallet_path=wallet_path, subwallet=subwallet)
+			result = self.fift.Run(fift_args)
 			if "Creating new" not in result:
+				print(result)
 				raise Exception("CreateWallet error")
 			#end if
 		wallet = self.GetLocalWallet(name, version)
@@ -1717,6 +1711,49 @@ def ImportWallet(self, addr_b64, key):
 		return wallet_name
 	#end define
 
+	def import_wallet_with_version(self, key, version, **kwargs):
+		wallet_name = kwargs.get("wallet_name")
+		workchain = kwargs.get("workchain", 0)
+		subwallet_default = 698983191 + workchain # 0x29A9A317 + workchain
+		subwallet = kwargs.get("subwallet", subwallet_default)
+		if type(key) == bytes:
+			pk_bytes = key
+		else:
+			pk_bytes = base64.b64decode(key)
+		if wallet_name == None:
+			wallet_name = self.GenerateWalletName()
+		wallet_path = self.walletsDir + wallet_name
+		with open(wallet_path + ".pk", 'wb') as file:
+			file.write(pk_bytes)
+		fift_args = self.get_new_wallet_fift_args(version, workchain=workchain, 
+			wallet_path=wallet_path, subwallet=subwallet)
+		result = self.fift.Run(fift_args)
+		if "Creating new" not in result:
+			print(result)
+			raise Exception("import_wallet_with_version error")
+		wallet = self.GetLocalWallet(wallet_name, version)
+		self.SetWalletVersion(wallet.addrB64, version)
+		return wallet
+	#end define
+
+	def get_new_wallet_fift_args(self, version, **kwargs):
+		workchain = kwargs.get("workchain")
+		wallet_path = kwargs.get("wallet_path")
+		subwallet = kwargs.get("subwallet")
+		if "v1" in version:
+			fift_script = "new-wallet.fif"
+			args = [fift_script, workchain, wallet_path]
+		elif "v2" in version:
+			fift_script = "new-wallet-v2.fif"
+			args = [fift_script, workchain, wallet_path]
+		elif "v3" in version:
+			fift_script = "new-wallet-v3.fif"
+			args = [fift_script, workchain, subwallet, wallet_path]
+		else:
+			raise Exception(f"get_wallet_fift error: fift script for `{version}` not found")
+		return args
+	#end define
+
 	def addr_b64_to_bytes(self, addr_b64):
 		workchain, addr, bounceable = self.ParseAddrB64(addr_b64)
 		workchain_bytes = int.to_bytes(workchain, 4, "big", signed=True)

mytonctrl/mytonctrl.py

@@ -147,6 +147,7 @@ def inject_globals(func):
 
 	console.AddItem("cleanup", inject_globals(cleanup_validator_db), local.translate("cleanup_cmd"))
 	console.AddItem("benchmark", inject_globals(run_benchmark), local.translate("benchmark_cmd"))
+	console.AddItem("activate_ton_storage_provider", inject_globals(activate_ton_storage_provider), local.translate("activate_ton_storage_provider_cmd"))
 
 	# Process input parameters
 	opts, args = getopt.getopt(argv,"hc:w:",["config=","wallets="])
@@ -176,6 +177,24 @@ def inject_globals(func):
 	local.db.config.logLevel = "debug" if console.debug else "info"
 	local.db.config.isLocaldbSaving = False
 	local.run()
+#end define
+
+
+def activate_ton_storage_provider(local, ton, args):
+	wallet_name = "provider_wallet_001"
+	wallet = ton.GetLocalWallet(wallet_name)
+	account = ton.GetAccount(wallet.addrB64)
+	if account.status == "active":
+		color_print("activate_ton_storage_provider - {green}Already activated{endc}")
+		#return
+	ton.ActivateWallet(wallet)
+	destination = "0:7777777777777777777777777777777777777777777777777777777777777777"
+	ton_storage = ton.GetSettings("ton_storage")
+	comment = f"tsp-{ton_storage.provider.pubkey}"
+	flags = ["-n", "-C", comment]
+	ton.MoveCoins(wallet, destination, 0.01, flags=flags)
+	color_print("activate_ton_storage_provider - {green}OK{endc}")
+#end define
 
 
 def check_installer_user():

mytoninstaller/config.py

@@ -34,6 +34,14 @@ def SetConfig(**kwargs):
 #end define
 
 
+def backup_config(local, config_path):
+	backup_path = f"{config_path}.backup"
+	local.add_log(f"Backup config file '{config_path}' to '{backup_path}'", "debug")
+	args = ["cp", config_path, backup_path]
+	subprocess.run(args)
+#end define
+
+
 def BackupVconfig(local):
 	local.add_log("Backup validator config file 'config.json' to 'config.json.backup'", "debug")
 	vconfig_path = local.buffer.vconfig_path

mytoninstaller/mytoninstaller.py

@@ -25,7 +25,9 @@
 	EnableTonHttpApi,
 	DangerousRecoveryValidatorConfigFile,
 	CreateSymlinks,
-	enable_ls_proxy
+	enable_ls_proxy,
+	enable_ton_storage,
+	enable_ton_storage_provider
 )
 from mytoninstaller.config import (
 	CreateLocalConfig,
@@ -172,6 +174,7 @@ def Enable(local, args):
 		print("'JR' - jsonrpc")
 		print("'THA' - ton-http-api")
 		print("'LSP' - ls-proxy")
+		print("'TSP' - ton-storage + ton-storage-provider")
 		print("Example: 'enable FN'")
 		return
 	if name == "THA":
@@ -236,6 +239,9 @@ def Event(local, name):
 		EnableTonHttpApi(local)
 	if name == "enableLSP":
 		enable_ls_proxy(local)
+	if name == "enableTSP":
+		enable_ton_storage(local)
+		enable_ton_storage_provider(local)
 	if name == "clc":
 		ix = sys.argv.index("-i")
 		initBlock_b64 = sys.argv[ix+1]

mytoninstaller/scripts/ls_proxy_installer.sh

@@ -1,11 +1,12 @@
 #!/bin/bash
 set -e
 
+# import functions: check_superuser, get_cpu_number, check_go_version
+my_dir=$(dirname $(realpath ${0}))
+. ${my_dir}/utils.sh
+
 # Проверить sudo
-if [ "$(id -u)" != "0" ]; then
-	echo "Please run script as root"
-	exit 1
-fi
+check_superuser
 
 # install parameters
 src_path=/usr/src
@@ -40,64 +41,46 @@ ENDC='\033[0m'
 echo -e "${COLOR}[1/4]${ENDC} Cloning github repository"
 echo "https://github.com/${author}/${repo}.git -> ${branch}"
 
+
+package_src_path=${src_path}/${repo}
+rm -rf ${package_src_path}
+
 cd ${src_path}
-rm -rf ${repo}
 git clone --branch=${branch} --recursive https://github.com/${author}/${repo}.git
 
 # Установка компонентов
 echo -e "${COLOR}[2/4]${ENDC} Installing required packages"
-
-arc=$(dpkg --print-architecture)
-go_version_url=https://go.dev/VERSION?m=text
-go_version=$(curl -s ${go_version_url} | head -n 1)
-go_url=https://go.dev/dl/${go_version}.linux-${arc}.tar.gz
 go_path=/usr/local/go/bin/go
-rm -rf /usr/local/go
-wget -c ${go_url} -O - | tar -C /usr/local -xz
-
-# Расчитываем количество процессоров для сборки
-if [[ "$OSTYPE" =~ darwin.* ]]; then
-	cpu_number=$(sysctl -n hw.logicalcpu)
-else
-	memory=$(cat /proc/meminfo | grep MemAvailable | awk '{print $2}')
-	cpu_number=$(($memory/2100000))
-	max_cpu_number=$(nproc)
-	if [ ${cpu_number} -gt ${max_cpu_number} ]; then
-		cpu_number=$((${max_cpu_number}-1))
-	fi
-	if [ ${cpu_number} == 0 ]; then
-		echo "Warning! insufficient RAM"
-		cpu_number=1
-	fi
-fi
+check_go_version "${package_src_path}/go.mod" ${go_path}
 
 # Компилируем из исходников
+cpu_number=$(get_cpu_number)
 echo -e "${COLOR}[3/4]${ENDC} Source compilation, use ${cpu_number} cpus"
 
-proxy_src_path=${src_path}/${repo}
-ton_src_path=${proxy_src_path}/ton
-proxy_internal_path=${proxy_src_path}/internal/emulate/lib
+ton_src_path=${package_src_path}/ton
+proxy_internal_path=${package_src_path}/internal/emulate/lib
 
 proxy_build_path=${bin_path}/${bin_name}
 ton_build_path=${proxy_build_path}/ton
-proxy_db_path=/var/${bin_name}
-proxy_lib_path=${proxy_db_path}/lib
+db_path=/var/${bin_name}
+lib_path=${db_path}/lib
 
-mkdir -p ${proxy_lib_path}
+mkdir -p ${lib_path}
 mkdir -p ${ton_build_path} && cd ${ton_build_path}
 cmake -DCMAKE_BUILD_TYPE=Release -DOPENSSL_FOUND=1 -DOPENSSL_INCLUDE_DIR=${openssl_path}/include -DOPENSSL_CRYPTO_LIBRARY=${openssl_path}/libcrypto.a ${ton_src_path}
 make emulator -j ${cpu_number}
-cp ${ton_build_path}/emulator/libemulator.so ${proxy_lib_path}
+cp ${ton_build_path}/emulator/libemulator.so ${lib_path}
 cp ${ton_build_path}/emulator/libemulator.so ${proxy_internal_path}
 cp ${ton_build_path}/emulator/emulator_export.h ${proxy_internal_path}
 
 # Компилируем
-cd ${proxy_src_path}
-CGO_ENABLED=1 ${go_path} build -o ${proxy_db_path}/${bin_name} ${proxy_src_path}/cmd/main.go
+cd ${package_src_path}
+entry_point=$(find ${package_src_path} -name "main.go" | head -n 1)
+CGO_ENABLED=1 ${go_path} build -o ${db_path}/${bin_name} ${entry_point}
 
 # Настроить директорию работы
-chown -R ${user}:${user} ${proxy_db_path}
+chown -R ${user}:${user} ${db_path}
 
 # Выход из программы
 echo -e "${COLOR}[4/4]${ENDC} ${bin_name} installation complete"
-exit 0
+exit 0