Merge branch 'dev' into bot

Author: yungwine

modules/utilities.py

@@ -365,6 +365,21 @@ def check_adnl_connection(self):
                 error = f'{{red}}Failed to check ADNL connection to local node: {response.get("message")}{{endc}}'
         return ok, error
 
+    def get_pool_data(self, args):
+        try:
+            pool_name = args[0]
+        except:
+            color_print("{red}Bad args. Usage:{endc} get_pool_data <pool-name | pool-addr>")
+            return
+        if self.ton.IsAddr(pool_name):
+            pool_addr = pool_name
+        else:
+            pool = self.ton.GetLocalPool(pool_name)
+            pool_addr = pool.addrB64
+        pool_data = self.ton.GetPoolData(pool_addr)
+        print(json.dumps(pool_data, indent=4))
+    # end define
+
     def add_console_commands(self, console):
         console.AddItem("vas", self.view_account_status, self.local.translate("vas_cmd"))
         console.AddItem("vah", self.view_account_history, self.local.translate("vah_cmd"))
@@ -380,3 +395,4 @@ def add_console_commands(self, console):
         console.AddItem("vl", self.print_validator_list, self.local.translate("vl_cmd"))
         console.AddItem("cl", self.print_complaints_list, self.local.translate("cl_cmd"))
 
+        console.AddItem("get_pool_data", self.get_pool_data, self.local.translate("get_pool_data_cmd"))

mytoncore/mytoncore.py

@@ -1624,7 +1624,7 @@ def CreateWallet(self, name, workchain=0, version="v1", **kwargs):
 		if os.path.isfile(wallet_path + ".pk") and "v3" not in version:
 			self.local.add_log("CreateWallet error: Wallet already exists: " + name, "warning")
 		else:
-			fift_args = self.get_new_wallet_fift_args(version, workchain=workchain, 
+			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:
@@ -1681,7 +1681,7 @@ def import_wallet_with_version(self, key, version, **kwargs):
 		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, 
+		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:
@@ -2310,6 +2310,7 @@ def get_valid_complaints(self, complaints: dict, election_id: int):
 				continue
 
 			exists = False
+			vload = None
 			for item in validators_load.values():
 				if 'fileName' not in item:
 					continue
@@ -2319,15 +2320,16 @@ def get_valid_complaints(self, complaints: dict, election_id: int):
 				pseudohash = pubkey + str(election_id)
 				if pseudohash == complaint['pseudohash']:
 					exists = True
-					vid = item['id']
+					vload = item
 					break
 
 			if not exists:
 				self.local.add_log(f"complaint {complaint['hash_hex']} declined: complaint info was not found, probably it's wrong", "info")
 				continue
 
-			if vid >= config32['mainValidators']:
-				self.local.add_log(f"complaint {complaint['hash_hex']} declined: complaint created for non masterchain validator", "info")
+			if (vload["id"] >= config32['mainValidators'] and
+				vload["masterBlocksCreated"] + vload["workBlocksCreated"] > 0):
+				self.local.add_log(f"complaint {complaint['hash_hex']} declined: complaint created for non masterchain validator that created more than zero blocks", "info")
 				continue
 
 			# check complaint fine value
@@ -2526,7 +2528,7 @@ def CheckValidators(self, start, end):
 			pseudohash = pubkey + str(electionId)
 			if pseudohash in valid_complaints or pseudohash in voted_complaints_pseudohashes:  # do not create complaints that already created or voted by ourself
 				continue
-			if item['id'] >= config['mainValidators']:  # do not create complaints for non-masterchain validators
+			if item['id'] >= config['mainValidators'] and item["masterBlocksCreated"] + item["workBlocksCreated"] > 0:  # create complaints for non-masterchain validators only if they created 0 blocks
 				continue
 			# Create complaint
 			fileName = self.remove_proofs_from_complaint(fileName)

scripts/install.py

@@ -66,7 +66,7 @@ def parse_args(answers: dict):
         if validator_mode == 'Nominator pool':
             validator_mode = 'nominator-pool'
         elif validator_mode == 'Single pool':
-            validator_mode = 'single-pool'
+            validator_mode = 'single-nominator'
         elif validator_mode == 'Liquid Staking':
             validator_mode = 'liquid-staking'
         res += f' -m {validator_mode}'

scripts/install.sh

@@ -20,19 +20,20 @@ ton_node_version="master"  # Default version
 
 
 show_help_and_exit() {
-  echo 'Supported arguments:'
-  echo ' -c  PATH         Provide custom config for toninstaller.sh'
-  echo ' -t               Disable telemetry'
-  echo ' -i               Ignore minimum requirements'
-  echo ' -d               Use pre-packaged dump. Reduces duration of initial synchronization.'
-  echo ' -a               Set MyTonCtrl git repo author'
-  echo ' -r               Set MyTonCtrl git repo'
-  echo ' -b               Set MyTonCtrl git repo branch'
-  echo ' -m  MODE         Install MyTonCtrl with specified mode (validator or liteserver)'
-  echo ' -n  NETWORK      Specify the network (mainnet or testnet)'
-  echo ' -v  VERSION      Specify the ton node version (commit, branch, or tag)'
-  echo ' -h               Show this help'
-  exit
+    echo 'Supported arguments:'
+    echo ' -c  PATH         Provide custom config for toninstaller.sh'
+    echo ' -t               Disable telemetry'
+    echo ' -i               Ignore minimum requirements'
+    echo ' -d               Use pre-packaged dump. Reduces duration of initial synchronization.'
+    echo ' -a               Set MyTonCtrl git repo author'
+    echo ' -r               Set MyTonCtrl git repo'
+    echo ' -b               Set MyTonCtrl git repo branch'
+    echo ' -m  MODE         Install MyTonCtrl with specified mode (validator or liteserver)'
+    echo ' -n  NETWORK      Specify the network (mainnet or testnet)'
+    echo ' -v  VERSION      Specify the ton node version (commit, branch, or tag)'
+    echo ' -u  USER         Specify the user to be used for MyTonCtrl installation'
+    echo ' -h               Show this help'
+    exit
 }
 
 if [[ "${1-}" =~ ^-*h(elp)?$ ]]; then
@@ -47,7 +48,7 @@ dump=false
 cpu_required=16
 mem_required=64000000  # 64GB in KB
 
-while getopts ":c:tida:r:b:m:n:v:h" flag; do
+while getopts ":c:tida:r:b:m:n:v:u:h" flag; do
     case "${flag}" in
         c) config=${OPTARG};;
         t) telemetry=false;;
@@ -59,10 +60,11 @@ while getopts ":c:tida:r:b:m:n:v:h" flag; do
         m) mode=${OPTARG};;
         n) network=${OPTARG};;
         v) ton_node_version=${OPTARG};;
+        u) user=${OPTARG};;
         h) show_help_and_exit;;
         *)
             echo "Flag -${flag} is not recognized. Aborting"
-            exit 1 ;;
+        exit 1 ;;
     esac
 done
 
@@ -90,8 +92,8 @@ memory=$(cat /proc/meminfo | grep MemTotal | awk '{print $2}')
 
 echo "This machine has ${cpus} CPUs and ${memory}KB of Memory"
 if [ "$ignore" = false ] && ([ "${cpus}" -lt "${cpu_required}" ] || [ "${memory}" -lt "${mem_required}" ]); then
-	echo "Insufficient resources. Requires a minimum of "${cpu_required}"  processors and  "${mem_required}" RAM."
-	exit 1
+    echo "Insufficient resources. Requires a minimum of "${cpu_required}"  processors and  "${mem_required}" RAM."
+    exit 1
 fi
 
 echo -e "${COLOR}[2/5]${ENDC} Checking for required TON components"
@@ -100,9 +102,9 @@ BIN_DIR=/usr/bin
 
 # create dirs for OSX
 if [[ "$OSTYPE" =~ darwin.* ]]; then
-	SOURCES_DIR=/usr/local/src
-	BIN_DIR=/usr/local/bin
-	mkdir -p ${SOURCES_DIR}
+    SOURCES_DIR=/usr/local/src
+    BIN_DIR=/usr/local/bin
+    mkdir -p ${SOURCES_DIR}
 fi
 
 # check TON components
@@ -111,9 +113,9 @@ file2=${BIN_DIR}/ton/lite-client/lite-client
 file3=${BIN_DIR}/ton/validator-engine-console/validator-engine-console
 
 if  [ ! -f "${file1}" ] || [ ! -f "${file2}" ] || [ ! -f "${file3}" ]; then
-	echo "TON does not exists, building"
-	wget https://raw.githubusercontent.com/${author}/${repo}/${branch}/scripts/ton_installer.sh -O /tmp/ton_installer.sh
-	bash /tmp/ton_installer.sh -c ${config} -v ${ton_node_version}
+    echo "TON does not exists, building"
+    wget https://raw.githubusercontent.com/${author}/${repo}/${branch}/scripts/ton_installer.sh -O /tmp/ton_installer.sh
+    bash /tmp/ton_installer.sh -c ${config} -v ${ton_node_version}
 fi
 
 # Cloning mytonctrl
@@ -134,10 +136,12 @@ pip3 install -U .  # TODO: make installation from git directly
 echo -e "${COLOR}[4/5]${ENDC} Running mytoninstaller"
 # DEBUG
 
-parent_name=$(ps -p $PPID -o comm=)
-user=$(whoami)
-if [ "$parent_name" = "sudo" ] || [ "$parent_name" = "su" ] || [ "$parent_name" = "python3" ]; then
-    user=$(logname)
+if [ "${user}" = "" ]; then  # no user
+    parent_name=$(ps -p $PPID -o comm=)
+    user=$(whoami)
+    if [ "$parent_name" = "sudo" ] || [ "$parent_name" = "su" ] || [ "$parent_name" = "python3" ]; then
+        user=$(logname)
+    fi
 fi
 echo "User: $user"
 python3 -m mytoninstaller -u ${user} -t ${telemetry} --dump ${dump} -m ${mode}