Merge pull request #203 from yungwine/mytonctrl2_dev

modes refactoring

Author: igroman787

mytoncore/functions.py

@@ -79,15 +79,15 @@ def ValidatorDownEvent(local):
 
 
 def Elections(local, ton):
-    usePool = local.db.get("usePool")
-    if usePool == True:
+    use_pool = ton.using_pool()
+    use_liquid_staking = ton.using_liquid_staking()
+    if use_pool:
         ton.PoolsUpdateValidatorSet()
-        ton.RecoverStake()
+    if use_liquid_staking:
+        ton.ControllersUpdateValidatorSet()
+    ton.RecoverStake()
+    if ton.using_validator():
         ton.ElectionEntry()
-    else:
-        ton.RecoverStake()
-        ton.ElectionEntry()
-# end define
 
 
 def Statistics(local):
@@ -516,10 +516,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 not is_validator:
         return
-    # end if
 
     # Creating complaints
     slash_time = local.buffer.slash_time

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,
 }