add validator mode

Author: yungwine

mytoncore/functions.py

@@ -82,12 +82,9 @@ def Elections(local, ton):
     use_pool = ton.using_pool()
     if use_pool:
         ton.PoolsUpdateValidatorSet()
-        ton.RecoverStake()
+    ton.RecoverStake()
+    if ton.using_validator():
         ton.ElectionEntry()
-    else:
-        ton.RecoverStake()
-        ton.ElectionEntry()
-# end define
 
 
 def Statistics(local):
@@ -516,10 +513,10 @@ def Complaints(local, ton):
 
 
 def Slashing(local, ton):
-    isSlashing = local.db.get("isSlashing")
-    if isSlashing is not True:
+    is_slashing = local.db.get("isSlashing")
+    is_validator = ton.using_validator()
+    if is_slashing is not True or is_validator:
         return
-    # end if
 
     # Creating complaints
     slash_time = local.buffer.slash_time

mytoncore/mytoncore.py

@@ -1293,7 +1293,7 @@ def ProcessRecoverStake(self):
 	def GetStake(self, account, args=None):
 		stake = self.local.db.get("stake")
 		usePool = self.using_pool()
-		useController = self.local.db.get("useController")
+		useController = self.local.db.get("useController") or self.using_liquid_staking()
 		stakePercent = self.local.db.get("stakePercent", 99)
 		vconfig = self.GetValidatorConfig()
 		validators = vconfig.get("validators")
@@ -1372,7 +1372,7 @@ def GetValidatorWallet(self, mode="stake"):
 
 	def ElectionEntry(self, args=None):
 		usePool = self.using_pool()
-		useController = self.local.db.get("useController")
+		useController = self.local.db.get("useController") or self.using_liquid_staking()
 		wallet = self.GetValidatorWallet()
 		addrB64 = wallet.addrB64
 		if wallet is None:
@@ -3203,8 +3203,17 @@ def using_nominator_pool(self):
 		return (self.local.db.get("usePool") or  # for backward compatibility
 				self.get_mode_value('nominator-pool'))
 
+	def using_single_nominator(self):
+		return self.get_mode_value('single-nominator')
+
+	def using_liquid_staking(self):
+		return self.get_mode_value('liquid-staking')
+
 	def using_pool(self) -> bool:
-		return self.using_nominator_pool() or self.get_mode_value('single-nominator')
+		return self.using_nominator_pool() or self.using_single_nominator()
+
+	def using_validator(self):
+		return self.get_mode_value('validator')
 
 	def Tlb2Json(self, text):
 		# Заменить скобки

mytonctrl/modules/validator.py

@@ -0,0 +1,34 @@
+from mypylib.mypylib import color_print
+from mytonctrl.modules.module import MtcModule
+
+from mytoncore.functions import Elections
+
+
+class ValidatorModule(MtcModule):
+
+    def vote_offer(self, args):
+        if len(args) == 0:
+            color_print("{red}Bad args. Usage:{endc} vo <offer-hash>")
+            return
+        for offerHash in args:
+            self.ton.VoteOffer(offerHash)
+        color_print("VoteOffer - {green}OK{endc}")
+
+    def vote_election_entry(self, args):
+        Elections(self.ton.local, self.ton)
+        color_print("VoteElectionEntry - {green}OK{endc}")
+
+    def vote_complaint(self, args):
+        try:
+            election_id = args[0]
+            complaint_hash = args[1]
+        except:
+            color_print("{red}Bad args. Usage:{endc} vc <election-id> <complaint-hash>")
+            return
+        self.ton.VoteComplaint(election_id, complaint_hash)
+        color_print("VoteComplaint - {green}OK{endc}")
+
+    def add_console_commands(self, console):
+        console.AddItem("vo", self.vote_offer, self.local.translate("vo_cmd"))
+        console.AddItem("ve", self.vote_election_entry, self.local.translate("ve_cmd"))
+        console.AddItem("vc", self.vote_complaint, self.local.translate("vc_cmd"))

mytonctrl/mytonctrl.py

@@ -74,8 +74,12 @@ def inject_globals(func):
 	console.AddItem("status_modes", inject_globals(mode_status), local.translate("status_modes_cmd"))
 	console.AddItem("enable_mode", inject_globals(enable_mode), local.translate("enable_mode_cmd"))
 	console.AddItem("disable_mode", inject_globals(disable_mode), local.translate("disable_mode_cmd"))
+	console.AddItem("get", inject_globals(GetSettings), local.translate("get_cmd"))
+	console.AddItem("set", inject_globals(SetSettings), local.translate("set_cmd"))
+
 	console.AddItem("seqno", inject_globals(Seqno), local.translate("seqno_cmd"))
 	console.AddItem("getconfig", inject_globals(GetConfig), local.translate("getconfig_cmd"))
+	console.AddItem("get_pool_data", inject_globals(GetPoolData), local.translate("get_pool_data_cmd"))
 
 	console.AddItem("nw", inject_globals(CreatNewWallet), local.translate("nw_cmd"))
 	console.AddItem("aw", inject_globals(ActivateWallet), local.translate("aw_cmd"))
@@ -105,44 +109,42 @@ def inject_globals(func):
 	# console.AddItem("gdfa", inject_globals(GetDomainFromAuction), local.translate("gdfa_cmd"))
 
 	console.AddItem("ol", inject_globals(PrintOffersList), local.translate("ol_cmd"))
-	console.AddItem("vo", inject_globals(VoteOffer), local.translate("vo_cmd"))
 	console.AddItem("od", inject_globals(OfferDiff), local.translate("od_cmd"))
 
 	console.AddItem("el", inject_globals(PrintElectionEntriesList), local.translate("el_cmd"))
-	console.AddItem("ve", inject_globals(VoteElectionEntry), local.translate("ve_cmd"))
 	console.AddItem("vl", inject_globals(PrintValidatorList), local.translate("vl_cmd"))
 	console.AddItem("cl", inject_globals(PrintComplaintsList), local.translate("cl_cmd"))
-	console.AddItem("vc", inject_globals(VoteComplaint), local.translate("vc_cmd"))
 
-	console.AddItem("get", inject_globals(GetSettings), local.translate("get_cmd"))
-	console.AddItem("set", inject_globals(SetSettings), local.translate("set_cmd"))
 	#console.AddItem("xrestart", inject_globals(Xrestart), local.translate("xrestart_cmd"))
 	#console.AddItem("xlist", inject_globals(Xlist), local.translate("xlist_cmd"))
 	#console.AddItem("gpk", inject_globals(GetPubKey), local.translate("gpk_cmd"))
 	#console.AddItem("ssoc", inject_globals(SignShardOverlayCert), local.translate("ssoc_cmd"))
 	#console.AddItem("isoc", inject_globals(ImportShardOverlayCert), local.translate("isoc_cmd"))
 
-	console.AddItem("get_pool_data", inject_globals(GetPoolData), local.translate("get_pool_data_cmd"))
-
-	if ton.using_pool():
-		from mytonctrl.modules.pool import PoolModule
-		module = PoolModule(ton, local)
+	if ton.get_mode_value('validator'):
+		from mytonctrl.modules.validator import ValidatorModule
+		module = ValidatorModule(ton, local)
 		module.add_console_commands(console)
 
-	if ton.using_nominator_pool():
-		from mytonctrl.modules.nominator_pool import NominatorPoolModule
-		module = NominatorPoolModule(ton, local)
-		module.add_console_commands(console)
+		if ton.using_pool():  # add basic pool functions (pools_list, delete_pool, import_pool)
+			from mytonctrl.modules.pool import PoolModule
+			module = PoolModule(ton, local)
+			module.add_console_commands(console)
 
-	if ton.get_mode_value('single-nominator'):
-		from mytonctrl.modules.single_pool import SingleNominatorModule
-		module = SingleNominatorModule(ton, local)
-		module.add_console_commands(console)
+		if ton.using_nominator_pool():
+			from mytonctrl.modules.nominator_pool import NominatorPoolModule
+			module = NominatorPoolModule(ton, local)
+			module.add_console_commands(console)
 
-	if ton.get_mode_value('liquid-staking'):
-		from mytonctrl.modules.controller import ControllerModule
-		module = ControllerModule(ton, local)
-		module.add_console_commands(console)
+		if ton.get_mode_value('single-nominator'):
+			from mytonctrl.modules.single_pool import SingleNominatorModule
+			module = SingleNominatorModule(ton, local)
+			module.add_console_commands(console)
+
+		if ton.using_liquid_staking():
+			from mytonctrl.modules.controller import ControllerModule
+			module = ControllerModule(ton, local)
+			module.add_console_commands(console)
 
 	console.AddItem("cleanup", inject_globals(cleanup_validator_db), local.translate("cleanup_cmd"))
 	console.AddItem("benchmark", inject_globals(run_benchmark), local.translate("benchmark_cmd"))
@@ -1000,15 +1002,6 @@ def PrintOffersList(ton, args):
 		print_table(table)
 #end define
 
-def VoteOffer(ton, args):
-	if len(args) == 0:
-		color_print("{red}Bad args. Usage:{endc} vo <offer-hash>")
-		return
-	for offerHash in args:
-		ton.VoteOffer(offerHash)
-	color_print("VoteOffer - {green}OK{endc}")
-#end define
-
 def OfferDiff(ton, args):
 	try:
 		offerHash = args[0]
@@ -1063,17 +1056,6 @@ def PrintComplaintsList(ton, args):
 		print_table(table)
 #end define
 
-def VoteComplaint(ton, args):
-	try:
-		electionId = args[0]
-		complaintHash = args[1]
-	except:
-		color_print("{red}Bad args. Usage:{endc} vc <election-id> <complaint-hash>")
-		return
-	ton.VoteComplaint(electionId, complaintHash)
-	color_print("VoteComplaint - {green}OK{endc}")
-#end define
-
 def NewDomain(ton, args):
 	try:
 		domainName = args[0]
@@ -1172,11 +1154,6 @@ def PrintElectionEntriesList(ton, args):
 		print_table(table)
 #end define
 
-def VoteElectionEntry(ton, args):
-	Elections(ton.local, ton)
-	color_print("VoteElectionEntry - {green}OK{endc}")
-#end define
-
 def PrintValidatorList(ton, args):
 	past = "past" in args
 	data = ton.GetValidatorsList(past=past)