add more modes

Author: yungwine

mytoncore/functions.py

@@ -79,8 +79,8 @@ def ValidatorDownEvent(local):
 
 
 def Elections(local, ton):
-    usePool = local.db.get("usePool")
-    if usePool == True:
+    use_pool = ton.using_pool()
+    if use_pool:
         ton.PoolsUpdateValidatorSet()
         ton.RecoverStake()
         ton.ElectionEntry()

mytoncore/modes.py

@@ -1,4 +1,6 @@
 MODES = {  # mode_name : is_enabled_by_default
-    'Controller': False,
-    'Validator': True
+    'validator': True,
+    'nominator-pool': False,
+    'single-pool': False,
+    'liquid-staking': False,
 }

mytoncore/mytoncore.py

@@ -1292,7 +1292,7 @@ def ProcessRecoverStake(self):
 
 	def GetStake(self, account, args=None):
 		stake = self.local.db.get("stake")
-		usePool = self.local.db.get("usePool")
+		usePool = self.using_pool()
 		useController = self.local.db.get("useController")
 		stakePercent = self.local.db.get("stakePercent", 99)
 		vconfig = self.GetValidatorConfig()
@@ -1409,7 +1409,7 @@ def GetValidatorWallet(self, mode="stake"):
 	#end define
 
 	def ElectionEntry(self, args=None):
-		usePool = self.local.db.get("usePool")
+		usePool = self.using_pool()
 		useController = self.local.db.get("useController")
 		wallet = self.GetValidatorWallet()
 		addrB64 = wallet.addrB64
@@ -3237,6 +3237,13 @@ def get_mode_value(self, name):
 			raise Exception(f'No mode named {name} found in current modes: {current_modes}')
 		return current_modes[name]
 
+	def using_nominator_pool(self):
+		return (self.local.db.get("usePool") or  # for backward compatibility
+				self.get_mode_value('nominator-pool'))
+
+	def using_pool(self) -> bool:
+		return self.using_nominator_pool() or self.get_mode_value('single-nominator')
+
 	def Tlb2Json(self, text):
 		# Заменить скобки
 		start = 0

mytonctrl/modules/nominator_pool.py

@@ -0,0 +1,72 @@
+import os
+
+from mypylib.mypylib import color_print
+from mytonctrl.modules.pool import PoolModule
+
+
+class NominatorPoolModule(PoolModule):
+
+    def new_pool(self, args):
+        try:
+            pool_name = args[0]
+            validator_reward_share_percent = float(args[1])
+            max_nominators_count = int(args[2])
+            min_validator_stake = int(args[3])
+            min_nominator_stake = int(args[4])
+        except:
+            color_print("{red}Bad args. Usage:{endc} new_pool <pool-name> <validator-reward-share-percent> <max-nominators-count> <min-validator-stake> <min-nominator-stake>")
+            return
+        self.ton.CreatePool(pool_name, validator_reward_share_percent, max_nominators_count, min_validator_stake, min_nominator_stake)
+        color_print("NewPool - {green}OK{endc}")
+
+    def activate_pool(self, args):
+        try:
+            pool_name = args[0]
+        except:
+            color_print("{red}Bad args. Usage:{endc} activate_pool <pool-name>")
+            return
+        pool = self.ton.GetLocalPool(pool_name)
+        if not os.path.isfile(pool.bocFilePath):
+            self.local.add_log(f"Pool {pool_name} already activated", "warning")
+            return
+        self.ton.ActivatePool(pool)
+        color_print("ActivatePool - {green}OK{endc}")
+
+    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.ton.DepositToPool(poll_addr, amount)
+        color_print("DepositToPool - {green}OK{endc}")
+
+    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.ton.WithdrawFromPool(pool_addr, amount)
+        color_print("WithdrawFromPool - {green}OK{endc}")
+
+    def update_validator_set(self, args):
+        try:
+            pool_addr = args[0]
+        except:
+            color_print("{red}Bad args. Usage:{endc} update_validator_set <pool-addr>")
+            return
+        wallet = self.ton.GetValidatorWallet()
+        self.ton.PoolUpdateValidatorSet(pool_addr, wallet)
+        color_print("UpdateValidatorSet - {green}OK{endc}")
+
+    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"))
+
+

mytonctrl/modules/pool.py

@@ -0,0 +1,47 @@
+import os
+
+from mypylib.mypylib import color_print, print_table
+from mytonctrl.modules.module import MtcModule
+
+
+class PoolModule(MtcModule):
+
+    def print_pools_list(self, args):
+        table = list()
+        table += [["Name", "Status", "Balance", "Version", "Address"]]
+        data = self.ton.GetPools()
+        if data is None or len(data) == 0:
+            print("No data")
+            return
+        for pool in data:
+            account = self.ton.GetAccount(pool.addrB64)
+            if account.status != "active":
+                pool.addrB64 = pool.addrB64_init
+            version = self.ton.GetVersionFromCodeHash(account.codeHash)
+            table += [[pool.name, account.status, account.balance, version, pool.addrB64]]
+        print_table(table)
+
+    def delete_pool(self, args):
+        try:
+            pool_name = args[0]
+        except:
+            color_print("{red}Bad args. Usage:{endc} delete_pool <pool-name>")
+            return
+        pool = self.ton.GetLocalPool(pool_name)
+        pool.Delete()
+        color_print("DeletePool - {green}OK{endc}")
+
+    def import_pool(self, args):
+        try:
+            pool_name = args[0]
+            pool_addr = args[1]
+        except:
+            color_print("{red}Bad args. Usage:{endc} import_pool <pool-name> <pool-addr>")
+            return
+        self.ton.import_pool(pool_name, pool_addr)
+        color_print("import_pool - {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"))

mytonctrl/modules/single_pool.py

@@ -0,0 +1,34 @@
+import os
+
+from mypylib.mypylib import color_print
+from mytonctrl.modules.pool import PoolModule
+
+
+class SingleNominatorModule(PoolModule):
+
+    def new_single_pool(self, args):
+        try:
+            pool_name = args[0]
+            owner_address = args[1]
+        except:
+            color_print("{red}Bad args. Usage:{endc} new_single_pool <pool-name> <owner_address>")
+            return
+        self.ton.create_single_pool(pool_name, owner_address)
+        color_print("new_single_pool - {green}OK{endc}")
+
+    def activate_single_pool(self, args):
+        try:
+            pool_name = args[0]
+        except:
+            color_print("{red}Bad args. Usage:{endc} activate_single_pool <pool-name>")
+            return
+        pool = self.ton.GetLocalPool(pool_name)
+        if not os.path.isfile(pool.bocFilePath):
+            self.local.add_log(f"Pool {pool_name} already activated", "warning")
+            return
+        self.ton.activate_single_pool(pool)
+        color_print("activate_single_pool - {green}OK{endc}")
+
+    def add_console_commands(self, console):
+        console.AddItem("new_single_pool", self.new_single_pool, self.local.translate("new_single_pool_cmd"))
+        console.AddItem("activate_single_pool", self.activate_single_pool, self.local.translate("activate_single_pool_cmd"))