Merge remote-tracking branch 'tonblkch/mytonctrl2_dev' into warnings

Author: yungwine

modules/liteserver.py

@@ -5,23 +5,8 @@
 
 class LiteserverModule(MtcModule):
 
-    description = 'For liteserver usage only - can\'t be used with validator.'
+    description = 'For liteserver usage only without validator.'
     default_value = False
 
-    def enable(self):
-        from mytoninstaller.mytoninstaller import set_node_argument
-        set_node_argument(self.local, ["--celldb-no-preload-all"])
-        data = psutil.virtual_memory()
-        ram = data.total / 2**30
-        if ram < 100:
-            set_node_argument(self.local, ["--celldb-cache-size", "1073741824"])
-
-    def disable(self):
-        from mytoninstaller.mytoninstaller import set_node_argument
-        from mytoninstaller.node_args import get_node_args
-        set_node_argument(self.local, ["--celldb-no-preload-all", "-d"])
-        if get_node_args()['--celldb-cache-size']:
-            set_node_argument(self.local, ["--celldb-cache-size", "-d"])
-
     def add_console_commands(self, console):
         ...

modules/nominator_pool.py

@@ -78,42 +78,6 @@ def activate_pool(self, args):
         self.do_activate_pool(pool)
         color_print("ActivatePool - {green}OK{endc}")
 
-    def do_deposit_to_pool(self, pool_addr, amount):
-        wallet = self.ton.GetValidatorWallet()
-        bocPath = self.ton.local.buffer.my_temp_dir + wallet.name + "validator-deposit-query.boc"
-        fiftScript = self.ton.contractsDir + "nominator-pool/func/validator-deposit.fif"
-        args = [fiftScript, bocPath]
-        result = self.ton.fift.Run(args)
-        resultFilePath = self.ton.SignBocWithWallet(wallet, bocPath, pool_addr, amount)
-        self.ton.SendFile(resultFilePath, wallet)
-
-    def deposit_to_pool(self, args):
-        try:
-            poll_addr = args[0]
-            amount = float(args[1])
-        except:
-            color_print("{red}Bad args. Usage:{endc} deposit_to_pool <pool-addr> <amount>")
-            return
-        self.do_deposit_to_pool(poll_addr, amount)
-        color_print("DepositToPool - {green}OK{endc}")
-
-    def do_withdraw_from_pool(self, pool_addr, amount):
-        pool_data = self.ton.GetPoolData(pool_addr)
-        if pool_data["state"] == 0:
-            self.ton.WithdrawFromPoolProcess(pool_addr, amount)
-        else:
-            self.ton.PendWithdrawFromPool(pool_addr, amount)
-
-    def withdraw_from_pool(self, args):
-        try:
-            pool_addr = args[0]
-            amount = float(args[1])
-        except:
-            color_print("{red}Bad args. Usage:{endc} withdraw_from_pool <pool-addr> <amount>")
-            return
-        self.do_withdraw_from_pool(pool_addr, amount)
-        color_print("WithdrawFromPool - {green}OK{endc}")
-
     def update_validator_set(self, args):
         try:
             pool_addr = args[0]
@@ -127,8 +91,4 @@ def update_validator_set(self, args):
     def add_console_commands(self, console):
         console.AddItem("new_pool", self.new_pool, self.local.translate("new_pool_cmd"))
         console.AddItem("activate_pool", self.activate_pool, self.local.translate("activate_pool_cmd"))
-        console.AddItem("deposit_to_pool", self.deposit_to_pool, self.local.translate("deposit_to_pool_cmd"))
-        console.AddItem("withdraw_from_pool", self.withdraw_from_pool, self.local.translate("withdraw_from_pool_cmd"))
         console.AddItem("update_validator_set", self.update_validator_set, self.local.translate("update_validator_set_cmd"))
-
-

modules/pool.py

@@ -58,7 +58,45 @@ def check_download_pool_contract_scripts(self):
         if not os.path.isdir(contract_path):
             self.ton.DownloadContract("https://github.com/ton-blockchain/nominator-pool")
 
+    def do_deposit_to_pool(self, pool_addr, amount):
+        wallet = self.ton.GetValidatorWallet()
+        bocPath = self.ton.local.buffer.my_temp_dir + wallet.name + "validator-deposit-query.boc"
+        fiftScript = self.ton.contractsDir + "nominator-pool/func/validator-deposit.fif"
+        args = [fiftScript, bocPath]
+        result = self.ton.fift.Run(args)
+        resultFilePath = self.ton.SignBocWithWallet(wallet, bocPath, pool_addr, amount)
+        self.ton.SendFile(resultFilePath, wallet)
+
+    def deposit_to_pool(self, args):
+        try:
+            poll_addr = args[0]
+            amount = float(args[1])
+        except:
+            color_print("{red}Bad args. Usage:{endc} deposit_to_pool <pool-addr> <amount>")
+            return
+        self.do_deposit_to_pool(poll_addr, amount)
+        color_print("DepositToPool - {green}OK{endc}")
+
+    def do_withdraw_from_pool(self, pool_addr, amount):
+        pool_data = self.ton.GetPoolData(pool_addr)
+        if pool_data["state"] == 0:
+            self.ton.WithdrawFromPoolProcess(pool_addr, amount)
+        else:
+            self.ton.PendWithdrawFromPool(pool_addr, amount)
+
+    def withdraw_from_pool(self, args):
+        try:
+            pool_addr = args[0]
+            amount = float(args[1])
+        except:
+            color_print("{red}Bad args. Usage:{endc} withdraw_from_pool <pool-addr> <amount>")
+            return
+        self.do_withdraw_from_pool(pool_addr, amount)
+        color_print("WithdrawFromPool - {green}OK{endc}")
+
     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"))
         console.AddItem("import_pool", self.import_pool, self.local.translate("import_pool_cmd"))
+        console.AddItem("deposit_to_pool", self.deposit_to_pool, self.local.translate("deposit_to_pool_cmd"))
+        console.AddItem("withdraw_from_pool", self.withdraw_from_pool, self.local.translate("withdraw_from_pool_cmd"))

mytoncore/functions.py

@@ -57,6 +57,8 @@ def Event(local, event_name):
         enable_ton_storage_provider_event(local)
     elif event_name == "enable_liteserver_mode":
         enable_liteserver_mode(local)
+    elif event_name == "enable_validator_mode":
+        enable_validator_mode(local)
     local.exit()
 # end define
 
@@ -93,10 +95,17 @@ def enable_ton_storage_provider_event(local):
 #end define
 
 
+def enable_validator_mode(local):
+    from mytoninstaller.mytoninstaller import set_node_argument
+    set_node_argument(local, ['--archive-ttl', '86400'])  # limit validator archive ttl to 1 day
+
+
 def enable_liteserver_mode(local):
+    from mytoninstaller.mytoninstaller import set_node_argument
     ton = MyTonCore(local)
     ton.disable_mode('validator')
     ton.enable_mode('liteserver')
+    set_node_argument(local, ['--archive-ttl', '2592000'])  # limit liteserver archive ttl to 30 days
 #end define
 
 

mytoncore/mytoncore.py

@@ -3269,7 +3269,6 @@ def check_enable_mode(self, name):
 			if self.using_validator():
 				raise Exception(f'Cannot enable liteserver mode while validator mode is enabled. '
 								f'Use `disable_mode validator` first.')
-			MODES['liteserver'](self, self.local).enable()
 		if name == 'validator':
 			if self.using_liteserver():
 				raise Exception(f'Cannot enable validator mode while liteserver mode is enabled. '
@@ -3287,8 +3286,6 @@ def disable_mode(self, name):
 		current_modes = self.get_modes()
 		if name not in current_modes:
 			raise Exception(f'Unknown module name: {name}. Available modes: {", ".join(MODES)}')
-		if name == 'liteserver':
-			MODES['liteserver'](self, self.local).disable()
 		current_modes[name] = False
 		self.local.save()
 

mytonctrl/mytonctrl.py

@@ -250,8 +250,10 @@ def PreUp(local: MyPyClass, ton: MyTonCore):
 
 def Installer(args):
 	# args = ["python3", "/usr/src/mytonctrl/mytoninstaller.py"]
-	args = ["python3", "-m", "mytoninstaller"]
-	subprocess.run(args)
+	cmd = ["python3", "-m", "mytoninstaller"]
+	if args:
+		cmd += ["-c", *args]
+	subprocess.run(cmd)
 #end define
 
 

mytoninstaller/mytoninstaller.py

@@ -238,12 +238,29 @@ def Event(local, name):
 #end define
 
 
-def General(local):
+def Command(local, args, console):
+	cmd = args[0]
+	args = args[1:]
+	for item in console.menu_items:
+		if cmd == item.cmd:
+			console._try(item.func, args)
+			print()
+			local.exit()
+	print(console.unknown_cmd)
+	local.exit()
+#end define
+
+
+def General(local, console):
 	if "-u" in sys.argv:
 		ux = sys.argv.index("-u")
 		user = sys.argv[ux+1]
 		local.buffer.user = user
 		Refresh(local)
+	if "-c" in sys.argv:
+		cx = sys.argv.index("-c")
+		args = sys.argv[cx+1:]
+		Command(local, args, console)
 	if "-e" in sys.argv:
 		ex = sys.argv.index("-e")
 		name = sys.argv[ex+1]
@@ -282,7 +299,7 @@ def mytoninstaller():
 
 	Init(local, console)
 	if len(sys.argv) > 1:
-		General(local)
+		General(local, console)
 	else:
 		console.Run()
 	local.exit()

mytoninstaller/settings.py

@@ -891,6 +891,9 @@ def CreateSymlinks(local):
 
 
 def EnableMode(local):
+	args = ["python3", "-m", "mytoncore", "-e"]
 	if local.buffer.mode == 'liteserver':
-		args = ["python3", "-m", "mytoncore", "-e", "enable_liteserver_mode"]
-		subprocess.run(args)
+		args.append("enable_liteserver_mode")
+	elif local.buffer.mode == 'validator':
+		args.append("enable_validator_mode")
+	subprocess.run(args)