fix merge

Author: yungwine

modules/backups.py

@@ -40,7 +40,7 @@ def run_create_backup(args, user: Optional[str] = None):
             return subprocess.run(["bash", backup_script_path, "-u", user] + args, timeout=5)
 
     def create_backup(self, args):
-        if not check_usage_args_min_max_len("create_backup", args, 0, 2):
+        if not check_usage_args_min_max_len("create_backup", args, 0, 3):
             return
         tmp_dir = self.create_tmp_ton_dir()
         command_args = ["-m", self.ton.local.buffer.my_work_dir, "-t", tmp_dir]

modules/btc_teleport.py

@@ -6,6 +6,7 @@
 from mypylib.mypylib import run_as_root, color_print, bcolors, print_table
 from mytonctrl.console_cmd import add_command, check_usage_one_arg, check_usage_args_min_max_len
 from mytonctrl.utils import get_current_user
+from mytoncore.utils import get_package_resource_path
 
 
 class BtcTeleportModule(MtcModule):

modules/controller.py

@@ -106,9 +106,9 @@ def withdraw_from_controller(self, args):
     def calculate_annual_controller_percentage(self, args):
         if not check_usage_args_min_max_len("calculate_annual_controller_percentage", args, min_len=0, max_len=1):
             return
-        try:
+        if args:
             percent_per_round = float(args[0])
-        except:
+        else:
             percent_per_round = self.ton.GetSettings("max_interest_percent")
         config15 = self.ton.GetConfig(15)
         roundPeriod = config15["validators_elected_for"]

modules/wallet.py

@@ -29,7 +29,7 @@ def create_new_wallet(self, args):
             subwallet = int(args[3])
         else:
             subwallet = 698983191 + workchain  # 0x29A9A317 + workchain
-        wallet = self.ton.create_wallet(walletName, workchain, version, subwallet=subwallet)
+        wallet = self.ton.CreateWallet(walletName, workchain, version, subwallet=subwallet)
         table = list()
         table += [["Name", "Workchain", "Address"]]
         table += [[wallet.name, wallet.workchain, wallet.addrB64_init]]

mytonctrl/console_cmd.py

@@ -12,7 +12,7 @@
     "disable_mode": "<mode_name>",
     "about": "<mode_name>",
     "get": "<setting_name>",
-    "set": "<setting_name> <value>",
+    "set": "<setting_name> <value> [--force]",
     "create_backup": "[filename] [-u <user>]",
     "restore_backup": " <filename> [-y] [--skip-create-backup] [-u <user>]",
     "add_custom_overlay": "<name> <path_to_config>",

mytonctrl/mytonctrl.py

@@ -42,7 +42,7 @@
 )
 from mytoncore.utils import get_package_resource_path
 from mytoncore.telemetry import is_host_virtual
-from mytonctrl.console_cmd import add_command, check_usage_one_arg, check_usage_two_args
+from mytonctrl.console_cmd import add_command, check_usage_one_arg, check_usage_two_args, check_usage_args_min_max_len
 from mytonctrl.migrate import run_migrations
 from mytonctrl.utils import GetItemFromList, timestamp2utcdatetime, fix_git_config, is_hex, GetColorInt, \
 	pop_user_from_args, pop_arg_from_args
@@ -1019,7 +1019,7 @@ def GetSettings(ton, args):
 #end define
 
 def SetSettings(local, ton, args):
-	if not check_usage_two_args("set", args):
+	if not check_usage_args_min_max_len("set", args, min_len=2, max_len=3):
 		return
 	name = args[0]
 	value = args[1]