Merge pull request #354 from yungwine/dev

Dev

Author: igroman787

modules/utilities.py

@@ -302,7 +302,8 @@ def print_election_entries_list(self, args):
 
     def print_validator_list(self, args):
         past = "past" in args
-        data = self.ton.GetValidatorsList(past=past)
+        fast = "fast" in args
+        data = self.ton.GetValidatorsList(past=past, fast=fast)
         if data is None or len(data) == 0:
             print("No data")
             return
@@ -311,8 +312,8 @@ def print_validator_list(self, args):
             print(text)
         else:
             table = list()
-            table += [["ADNL", "Pubkey", "Wallet", "Efficiency", "Online"]]
-            for item in data:
+            table += [["id", "ADNL", "Pubkey", "Wallet", "Efficiency", "Online"]]
+            for i, item in enumerate(data):
                 adnl = item.get("adnlAddr")
                 pubkey = item.get("pubkey")
                 walletAddr = item.get("walletAddr")
@@ -330,7 +331,7 @@ def print_validator_list(self, args):
                     online = bcolors.green_text("true")
                 if not online:
                     online = bcolors.red_text("false")
-                table += [[adnl, pubkey, walletAddr, efficiency, online]]
+                table += [[str(i), adnl, pubkey, walletAddr, efficiency, online]]
             print_table(table)
     # end define
 

mytoncore/mytoncore.py

@@ -2491,6 +2491,8 @@ def CheckValidators(self, start, end):
 		electionId = start
 		complaints = self.GetComplaints(electionId)
 		valid_complaints = self.get_valid_complaints(complaints, electionId)
+		voted_complaints = self.GetVotedComplaints(complaints)
+		voted_complaints_pseudohashes = [complaint['pseudohash'] for complaint in voted_complaints.values()]
 		data = self.GetValidatorsLoad(start, end, saveCompFiles=True)
 		fullElectorAddr = self.GetFullElectorAddr()
 		wallet = self.GetValidatorWallet(mode="vote")
@@ -2510,7 +2512,7 @@ def CheckValidators(self, start, end):
 			var2 = item.get("var2")
 			pubkey = item.get("pubkey")
 			pseudohash = pubkey + str(electionId)
-			if pseudohash in valid_complaints:
+			if pseudohash in valid_complaints or pseudohash in voted_complaints_pseudohashes:  # do not create complaints that already created or voted by ourself
 				continue
 			if item['id'] >= config['mainValidators']:  # do not create complaints for non-masterchain validators
 				continue