Merge pull request #475 from yungwine/voting

Improve voting

Author: yungwine

modules/alert_bot.py

@@ -84,7 +84,7 @@ def init_alerts():
             "high",
             "Validator has been slashed in the previous validation round",
             "Validator has been slashed in previous round for {amount} TON",
-            FREEZE_PERIOD
+            VALIDATION_PERIOD
         ),
         "stake_not_accepted": Alert(
             "high",
@@ -438,8 +438,9 @@ def check_voting(self):
             return
         need_to_vote = []
         offers = self.ton.GetOffers()
+        saved_offers = self.ton.GetSaveOffers()
         for offer in offers:
-            if not offer['isPassed'] and offer['approvedPercent'] >= 50 and validator_index not in offer['votedValidators']:
+            if not offer['isPassed'] and offer['approvedPercent'] >= 50 and validator_index not in offer['votedValidators'] and offer['hash'] not in saved_offers:
                 need_to_vote.append(offer['hash'])
         if need_to_vote:
             self.send_alert("voting", hashes=' '.join(need_to_vote))

modules/utilities.py

@@ -162,6 +162,9 @@ def get_offer_diff(self, offer_hash):
         offer = self.ton.GetOffer(offer_hash)
         config_id = offer["config"]["id"]
         config_value = offer["config"]["value"]
+        if config_id < 0:
+            color_print("{red}Offer config id is negative. Cannot get diff.{endc}")
+            return
 
         if '{' in config_value or '}' in config_value:
             start = config_value.find('{') + 1

modules/validator.py

@@ -16,8 +16,13 @@ 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)
+        offers = self.ton.GetOffers()
+        for offer_hash in args:
+            offer = self.ton.GetOffer(offer_hash, offers)
+            self.ton.add_save_offer(offer)
+        for offer_hash in args:
+            offer = self.ton.GetOffer(offer_hash, offers)
+            self.ton.VoteOffer(offer)
         color_print("VoteOffer - {green}OK{endc}")
 
     def vote_election_entry(self, args):

mytoncore/functions.py

@@ -435,6 +435,10 @@ def GetBlockTimeAvg(local, timediff):
 
 def Offers(local, ton):
     save_offers = ton.GetSaveOffers()
+    if save_offers:
+        ton.offers_gc(save_offers)
+    else:
+        return
     offers = ton.GetOffers()
     for offer in offers:
         offer_hash = offer.get("hash")
@@ -446,7 +450,7 @@ def Offers(local, ton):
             else:  # old version of save offers {"hash": "pseudohash"}
                 save_offer_pseudohash = save_offer
             if offer_pseudohash == save_offer_pseudohash and offer_pseudohash is not None:
-                ton.VoteOffer(offer_hash)
+                ton.VoteOffer(offer)
 # end define
 
 def Telemetry(local, ton):

mytoncore/mytoncore.py

@@ -1223,11 +1223,17 @@ def SendFile(self, filePath, wallet=None, **kwargs):
 				self.liteClient.Run("sendfile " + filePath, useLocalLiteServer=False)
 			except: pass
 		if duplicateApi:
-			self.send_boc_toncenter(filePath)
+			try:
+				self.send_boc_toncenter(filePath)
+			except Exception as e:
+				self.local.add_log(f'Failed to send file {filePath} to toncenter: {e}', 'warning')
 		if timeout and wallet:
 			self.WaitTransaction(wallet, timeout)
-		if remove == True:
-			os.remove(filePath)
+		if remove:
+			try:
+				os.remove(filePath)
+			except Exception as e:
+				self.local.add_log(f'Failed to remove file {filePath}: {e}', 'warning')
 	#end define
 
 	def send_boc_toncenter(self, file_path: str):
@@ -2274,23 +2280,23 @@ def SignComplaintVoteRequestWithValidator(self, complaintHash, electionId, valid
 		return fileName
 	#end define
 
-	def VoteOffer(self, offerHash):
+	def VoteOffer(self, offer):
 		self.local.add_log("start VoteOffer function", "debug")
-		fullConfigAddr = self.GetFullConfigAddr()
+		full_config_addr = self.GetFullConfigAddr()
 		wallet = self.GetValidatorWallet(mode="vote")
-		validatorKey = self.GetValidatorKey()
-		validatorPubkey_b64 = self.GetPubKeyBase64(validatorKey)
-		validatorIndex = self.GetValidatorIndex()
-		offer = self.GetOffer(offerHash)
-		if validatorIndex in offer.get("votedValidators"):
+		validator_key = self.GetValidatorKey()
+		validator_pubkey_b64 = self.GetPubKeyBase64(validator_key)
+		validator_index = self.GetValidatorIndex()
+		offer_hash = offer.get("hash")
+		if validator_index in offer.get("votedValidators"):
 			self.local.add_log("Proposal already has been voted", "debug")
 			return
 		self.add_save_offer(offer)
-		var1 = self.CreateConfigProposalRequest(offerHash, validatorIndex)
-		validatorSignature = self.GetValidatorSignature(validatorKey, var1)
-		resultFilePath = self.SignProposalVoteRequestWithValidator(offerHash, validatorIndex, validatorPubkey_b64, validatorSignature)
-		resultFilePath = self.SignBocWithWallet(wallet, resultFilePath, fullConfigAddr, 1.5)
-		self.SendFile(resultFilePath, wallet)
+		var1 = self.CreateConfigProposalRequest(offer_hash, validator_index)
+		validator_signature = self.GetValidatorSignature(validator_key, var1)
+		result_file_path = self.SignProposalVoteRequestWithValidator(offer_hash, validator_index, validator_pubkey_b64, validator_signature)
+		result_file_path = self.SignBocWithWallet(wallet, result_file_path, full_config_addr, 1.5)
+		self.SendFile(result_file_path, wallet, remove=False)
 	#end define
 
 	def VoteComplaint(self, electionId, complaintHash):
@@ -2598,11 +2604,12 @@ def CheckValidators(self, start, end):
 			self.local.add_log("var1: {}, var2: {}, pubkey: {}, election_id: {}".format(var1, var2, pubkey, electionId), "debug")
 	#end define
 
-	def GetOffer(self, offerHash):
+	def GetOffer(self, offer_hash: str, offers: list = None):
 		self.local.add_log("start GetOffer function", "debug")
-		offers = self.GetOffers()
+		if offers is None:
+			offers = self.GetOffers()
 		for offer in offers:
-			if offerHash == offer.get("hash"):
+			if offer_hash == offer.get("hash"):
 				return offer
 		raise Exception("GetOffer error: offer not found.")
 	#end define
@@ -2872,9 +2879,11 @@ def offers_gc(self, save_offers):
 			if offer_hash not in current_offers_hashes:
 				if isinstance(offer, list):
 					param_id = offer[1]
-					if param_id is not None and offer[0] != self.calculate_offer_pseudohash(offer_hash, param_id):
+					phash = self.calculate_offer_pseudohash(offer_hash, param_id)
+					if param_id is not None and offer[0] != phash:
 						# param has been changed so no need to keep anymore
 						save_offers.pop(offer_hash)
+						self.local.add_log(f"Removing offer {offer_hash} from save_offers. Saved phash: {offer[0]}, now phash: {phash}", "debug")
 				else:  # old version of offer in db
 					save_offers.pop(offer_hash)
 		return save_offers
@@ -2885,7 +2894,6 @@ def GetSaveOffers(self):
 		if save_offers is None or isinstance(save_offers, list):
 			save_offers = dict()
 			self.local.db[bname] = save_offers
-		self.offers_gc(save_offers)
 		return save_offers
 	#end define
 
@@ -3208,12 +3216,15 @@ def set_initial_sync_off(self):
 		self.local.db.pop('initialSync', None)
 		self.local.save()
 
-	def Tlb2Json(self, text):
+	def Tlb2Json(self, text: str):
 		# Заменить скобки
 		start = 0
 		end = len(text)
 		if '=' in text:
 			start = text.find('=')+1
+		if text[start:].startswith(' x{'):  # param has no tlb scheme, return cell value
+			end = text.rfind('}')+1
+			return {'_': text[start:end].strip()}
 		if "x{" in text:
 			end = text.find("x{")
 		text = text[start:end]

mytonctrl/mytonctrl.py

@@ -631,8 +631,8 @@ def PrintStatus(local, ton, args):
 		startWorkTime = ton.GetActiveElectionId(fullElectorAddr)
 		validator_index = ton.GetValidatorIndex()
 
-		offersNumber = ton.GetOffersNumber()
-		complaintsNumber = ton.GetComplaintsNumber()
+		offersNumber = local.try_function(ton.GetOffersNumber)
+		complaintsNumber = local.try_function(ton.GetComplaintsNumber)
 
 		tpsAvg = ton.GetStatistics("tpsAvg", statistics)
 
@@ -654,10 +654,10 @@ def PrintTonStatus(local, network_name, startWorkTime, totalValidators, onlineVa
 	#tps5 = tpsAvg[1]
 	#tps15 = tpsAvg[2]
 	allValidators = totalValidators
-	newOffers = offersNumber.get("new")
-	allOffers = offersNumber.get("all")
-	newComplaints = complaintsNumber.get("new")
-	allComplaints = complaintsNumber.get("all")
+	newOffers = offersNumber.get("new") if offersNumber else 'n/a'
+	allOffers = offersNumber.get("all") if offersNumber else 'n/a'
+	newComplaints = complaintsNumber.get("new") if complaintsNumber else 'n/a'
+	allComplaints = complaintsNumber.get("all") if complaintsNumber else 'n/a'
 	#tps1_text = bcolors.green_text(tps1)
 	#tps5_text = bcolors.green_text(tps5)
 	#tps15_text = bcolors.green_text(tps15)