Merge pull request #496 from ton-blockchain/dev

Dev

Author: yungwine

modules/backups.py

@@ -3,10 +3,9 @@
 import subprocess
 import time
 
-import pkg_resources
-
 from modules.module import MtcModule
 from mypylib.mypylib import color_print, ip2int, run_as_root, parse, MyPyClass
+from mytoncore.utils import get_package_resource_path
 from mytonctrl.utils import get_current_user, pop_user_from_args
 from mytoninstaller.config import get_own_ip
 
@@ -32,8 +31,8 @@ def create_tmp_ton_dir(self):
     def run_create_backup(args, user: str = None):
         if user is None:
             user = get_current_user()
-        backup_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/create_backup.sh')
-        return subprocess.run(["bash", backup_script_path, "-u", user] + args, timeout=5)
+        with get_package_resource_path('mytonctrl', 'scripts/create_backup.sh') as backup_script_path:
+            return subprocess.run(["bash", backup_script_path, "-u", user] + args, timeout=5)
 
     def create_backup(self, args):
         if len(args) > 3:
@@ -58,8 +57,8 @@ def create_backup(self, args):
     def run_restore_backup(args, user: str = None):
         if user is None:
             user = get_current_user()
-        restore_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/restore_backup.sh')
-        return run_as_root(["bash", restore_script_path, "-u", user] + args)
+        with get_package_resource_path('mytonctrl', 'scripts/restore_backup.sh') as restore_script_path:
+            return run_as_root(["bash", restore_script_path, "-u", user] + args)
 
     def restore_backup(self, args):
         if len(args) == 0 or len(args) > 5:

modules/btc_teleport.py

@@ -2,10 +2,9 @@
 import os
 import subprocess
 
-import pkg_resources
-
 from modules.module import MtcModule
 from mypylib.mypylib import run_as_root, color_print, bcolors, print_table
+from mytoncore.utils import get_package_resource_path
 from mytonctrl.utils import get_current_user
 
 
@@ -59,20 +58,20 @@ def create_env_file(self, reinit=False):
 
     def add_daemon(self, user: str = None):
         start = f'{self.bin_dir}/oracle'
-        script_path = pkg_resources.resource_filename('mytoninstaller', 'scripts/add2systemd.sh')
         if user is None:
             user = get_current_user()
-        run_as_root(['bash', script_path, '-n', 'btc_teleport', '-u', user, '-g', user, '-s', start, '-w', self.bin_dir])
+        with get_package_resource_path('mytoninstaller', 'scripts/add2systemd.sh') as script_path:
+            run_as_root(['bash', script_path, '-n', 'btc_teleport', '-u', user, '-g', user, '-s', start, '-w', self.bin_dir])
 
     def install(self, branch: str, user: str = None):
-        script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/btc_teleport1.sh')
         if user is None:
             user = get_current_user()
-        exit_code = run_as_root(["bash", script_path, "-s", '/usr/src', "-r", self.repo_name, "-b", branch, "-u", user])
+        with get_package_resource_path('mytonctrl', 'scripts/btc_teleport1.sh') as script_path:
+            exit_code = run_as_root(["bash", script_path, "-s", '/usr/src', "-r", self.repo_name, "-b", branch, "-u", user])
         if exit_code != 0:
             raise Exception('Failed to install btc_teleport')
-        script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/btc_teleport2.sh')
-        subprocess.run(["bash", script_path, "-s", self.src_dir])
+        with get_package_resource_path('mytonctrl', 'scripts/btc_teleport2.sh') as script_path:
+            subprocess.run(["bash", script_path, "-s", self.src_dir])
 
     def init(self, reinstall=False, branch: str = 'master', user: str = None):
         if os.path.exists(self.src_dir) and not reinstall:
@@ -89,8 +88,8 @@ def init(self, reinstall=False, branch: str = 'master', user: str = None):
 
     @staticmethod
     def run_remove_btc_teleport(args):
-        script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/remove_btc_teleport.sh')
-        return run_as_root(["bash", script_path] + args)
+        with get_package_resource_path('mytonctrl', 'scripts/remove_btc_teleport.sh') as script_path:
+            return run_as_root(["bash", script_path] + args)
 
     def get_save_offers(self):
         bname = "saveOffersBtcTeleport"
@@ -233,5 +232,3 @@ def remove_btc_teleport(self, args: list):
 
     def add_console_commands(self, console):
         console.AddItem("remove_btc_teleport", self.remove_btc_teleport, self.local.translate("remove_btc_teleport_cmd"))
-        console.AddItem("vote_offer_btc_teleport", self.vote_offer_btc_teleport, self.local.translate("vote_offer_btc_teleport_cmd"))
-        console.AddItem("print_offers_btc_teleport_list", self.print_offers_btc_teleport_list, self.local.translate("print_offers_btc_teleport_list_cmd"))

modules/single_pool.py

@@ -1,9 +1,8 @@
 import os
 
-import pkg_resources
-
 from mypylib.mypylib import color_print
 from modules.pool import PoolModule
+from mytoncore.utils import get_package_resource_path
 
 
 class SingleNominatorModule(PoolModule):
@@ -21,12 +20,11 @@ def do_create_single_pool(self, pool_name, owner_address):
             self.ton.local.add_log("create_single_pool warning: Pool already exists: " + file_path, "warning")
             return
 
-        fift_script = pkg_resources.resource_filename('mytoncore', 'contracts/single-nominator-pool/init.fif')
-        code_boc = pkg_resources.resource_filename('mytoncore',
-                                                   'contracts/single-nominator-pool/single-nominator-code.hex')
         validator_wallet = self.ton.GetValidatorWallet()
-        args = [fift_script, code_boc, owner_address, validator_wallet.addrB64, file_path]
-        result = self.ton.fift.Run(args)
+        with get_package_resource_path('mytoncore', 'contracts/single-nominator-pool/init.fif') as fift_script:
+            with get_package_resource_path('mytoncore', 'contracts/single-nominator-pool/single-nominator-code.hex') as code_boc:
+                args = [fift_script, code_boc, owner_address, validator_wallet.addrB64, file_path]
+                result = self.ton.fift.Run(args)
         if "Saved single nominator pool" not in result:
             raise Exception("create_single_pool error: " + result)
 

mytoncore/functions.py

@@ -499,6 +499,7 @@ def Telemetry(local, ton):
     data["cpuInfo"] = {'cpuName': local.try_function(get_cpu_name), 'virtual': local.try_function(is_host_virtual)}
     data["validatorDiskName"] = local.try_function(get_validator_disk_name)
     data["pings"] = local.try_function(get_pings_values)
+    data["pythonVersion"] = sys.version
 
     # Get git hashes
     gitHashes = dict()
@@ -649,24 +650,34 @@ def gc_import(local, ton):
     if not files:
         local.add_log("No files left to import", "debug")
         ton.local.db['importGc'] = False
+        ton.local.save()
         return
     try:
         status = ton.GetValidatorStatus()
         node_seqno = int(status.shardclientmasterchainseqno)
     except Exception as e:
         local.add_log(f"Failed to get shardclientmasterchainseqno: {e}", "warning")
         return
-    removed = 0
-    for file in files:
-        file_seqno = int(file.split('.')[1])
-        if node_seqno > file_seqno + 101:
-            try:
-                os.remove(os.path.join(import_path, file))
-                removed += 1
-            except PermissionError:
-                local.add_log(f"Failed to remove file {file}: Permission denied", "error")
-                continue
-    local.add_log(f"Removed {removed} import files up to {node_seqno} seqno", "debug")
+    to_delete = []
+    to_delete_dirs = []
+    for root, dirs, files in os.walk(import_path):
+        if root != import_path and not dirs and not files:
+            to_delete_dirs.append(root)
+        for file in files:
+            file_seqno = int(file.split('.')[1])
+            if node_seqno > file_seqno + 101:
+                to_delete.append(os.path.join(root, file))
+    for file_path in to_delete:
+        try:
+            os.remove(file_path)
+        except Exception as e:
+            local.add_log(f"Failed to remove file {file_path}: {e}", "error")
+    for dir_path in to_delete_dirs:
+        try:
+            os.rmdir(dir_path)
+        except Exception as e:
+            local.add_log(f"Failed to remove dir {dir_path}: {e}", "error")
+    local.add_log(f"Removed {len(to_delete)} import files and {len(to_delete_dirs)} import dirs up to {node_seqno} seqno", "debug")
 
 
 def backup_mytoncore_logs(local: MyPyClass, ton: MyTonCore):
@@ -741,8 +752,7 @@ def General(local):
     if ton.in_initial_sync():
         local.start_cycle(check_initial_sync, sec=120, args=(local, ton))
 
-    if ton.local.db.get('importGc'):
-        local.start_cycle(gc_import, sec=300, args=(local, ton))
+    local.start_cycle(gc_import, sec=600, args=(local, ton))
 
     thr_sleep()
 # end define

mytoncore/mytoncore.py

@@ -7,13 +7,12 @@
 import struct
 import psutil
 import subprocess
-import pkg_resources
 import requests
 from fastcrc import crc16
 
 from modules import MODES
 from modules.btc_teleport import BtcTeleportModule
-from mytoncore.utils import xhex2hex, ng2g
+from mytoncore.utils import xhex2hex, ng2g, get_package_resource_path
 from mytoncore.liteclient import LiteClient
 from mytoncore.validator_console import ValidatorConsole
 from mytoncore.fift import Fift
@@ -1115,9 +1114,9 @@ def CreateComplaintRequest(self, electionId, complaintHash, validatorIndex):
 	def remove_proofs_from_complaint(self, input_file_name: str):
 		self.local.add_log("start remove_proofs_from_complaint function", "debug")
 		output_file_name = self.tempDir + "complaint-new.boc"
-		fift_script = pkg_resources.resource_filename('mytoncore', 'complaints/remove-proofs-v2.fif')
-		args = [fift_script, input_file_name, output_file_name]
-		result = self.fift.Run(args)
+		with get_package_resource_path('mytoncore', 'complaints/remove-proofs-v2.fif') as fift_script:
+			args = [fift_script, input_file_name, output_file_name]
+			result = self.fift.Run(args)
 		return output_file_name
 
 
@@ -1304,7 +1303,7 @@ def GetStake(self, account, args=None):
 		stake = self.local.db.get("stake")
 		usePool = self.using_pool()
 		useController = self.using_liquid_staking()
-		stakePercent = self.local.db.get("stakePercent", 99)
+		stakePercent = self.local.db.get("stakePercent", 100)
 		vconfig = self.GetValidatorConfig()
 		validators = vconfig.get("validators")
 		config17 = self.GetConfig17()
@@ -1343,6 +1342,8 @@ def GetStake(self, account, args=None):
 					stake = int(account.balance*sp)
 			elif len(vconfig.validators) > 0:
 				stake = int(account.balance*sp)
+			if stakePercent == 100:
+				stake -= 20
 
 		# Check if we have enough coins
 		if stake > config17["maxStake"]:

mytoncore/utils.py

@@ -2,6 +2,12 @@
 import json
 import re
 import subprocess
+try:
+    # Python 3.9+
+    from importlib.resources import files, as_file
+except ImportError:
+    # Python < 3.9
+    from importlib_resources import files, as_file
 
 
 def str2b64(s):
@@ -177,3 +183,8 @@ def shard_is_ancestor(parent: int, child: int) -> bool:
     y = _lower_bit64(uc)
     mask = (_bits_negate64(x) << 1) & _MASK64
     return x >= y and not ((up ^ uc) & mask)
+
+
+def get_package_resource_path(package: str, resource: str):
+    ref = files(package) / resource
+    return as_file(ref)

mytonctrl/migrate.py

@@ -1,7 +1,7 @@
 import os
-import pkg_resources
 
 from mypylib.mypylib import MyPyClass
+from mytoncore.utils import get_package_resource_path
 from mytoncore.mytoncore import MyTonCore
 
 from mypylib.mypylib import (
@@ -13,9 +13,9 @@
 
 def migrate_to_version_1(local: MyPyClass, ton: MyTonCore):
     # get script path
-    migrate_script_path = pkg_resources.resource_filename('mytonctrl', 'migrations/migration_001.sh')
-    args = ["/bin/bash", migrate_script_path]
-    exit_code = run_as_root(args)
+    with get_package_resource_path('mytonctrl', 'migrations/migration_001.sh') as migrate_script_path:
+        args = ["/bin/bash", migrate_script_path]
+        exit_code = run_as_root(args)
     if exit_code != 0:
         raise RuntimeError(f'Failed to run migration error. Exit code: {exit_code}')
     return