update mypylib

Author: igroman787

README.md

@@ -1,13 +1,13 @@
 ![GitHub stars](https://img.shields.io/github/stars/ton-blockchain/mytonctrl?style=flat-square&logo=github) ![GitHub forks](https://img.shields.io/github/forks/ton-blockchain/mytonctrl?style=flat-square&logo=github) ![GitHub issues](https://img.shields.io/github/issues/ton-blockchain/mytonctrl?style=flat-square&logo=github) ![GitHub pull requests](https://img.shields.io/github/issues-pr/ton-blockchain/mytonctrl?style=flat-square&logo=github) ![GitHub last commit](https://img.shields.io/github/last-commit/ton-blockchain/mytonctrl?style=flat-square&logo=github) ![GitHub license](https://img.shields.io/github/license/ton-blockchain/mytonctrl?style=flat-square&logo=github)
 
 <!-- omit from toc --> 
-# MytTonCtrl
+# MyTonCtrl
 [Данный текст доступен на русском языке.](README.Ru.md)
 
 <!-- omit from toc --> 
 ## Contents
 
-- [What is MytTonCtrl?](#what-is-myttonctrl)
+- [What is MyTonCtrl?](#what-is-myttonctrl)
 - [Functionality](#functionality)
 	- [List of tested operating systems](#list-of-tested-operating-systems)
 - [Installation](#installation)
@@ -23,7 +23,7 @@
 - [Useful links](#useful-links)
 
 
-# What is MytTonCtrl?
+# What is MyTonCtrl?
 MyTonCtrl is a console application that serves as a convenient wrapper for `fift`, `lite-client`, and `validator-engine-console`. It has been specifically developed to streamline wallet, domain, and validator management tasks on the Linux operating system.
 
 ![MyTonCtrl Status](screens/mytonctrl-status.png)

mypylib

@@ -749,7 +749,7 @@ def WalletVersion2Wallet(self, wallet):
 	def SetWalletVersion(self, addrB64, version):
 		walletsVersionList = self.GetWalletsVersionList()
 		walletsVersionList[addrB64] = version
-		#local.save_db()
+		local.save()
 	#end define
 
 	def GetWalletVersionFromHash(self, inputHash):
@@ -2928,7 +2928,7 @@ def AddDomain(self, domain):
 			local.db["domains"] = list()
 		#end if
 		local.db["domains"].append(domain)
-		#local.save_db()
+		local.save()
 	#end define
 
 	def GetDomains(self):
@@ -2952,7 +2952,7 @@ def DeleteDomain(self, domainName):
 		for domain in domains:
 			if (domainName == domain.get("name")):
 				domains.remove(domain)
-				#local.save_db()
+				local.save()
 				return
 		raise Exception("DeleteDomain error: Domain not found")
 	#end define
@@ -2968,15 +2968,15 @@ def GetAutoTransferRules(self):
 	def AddAutoTransferRule(self, rule):
 		autoTransferRules = self.GetAutoTransferRules()
 		autoTransferRules.append(rule)
-		#local.save_db()
+		local.save()
 	#end define
 
 	def AddBookmark(self, bookmark):
 		if "bookmarks" not in local.db:
 			local.db["bookmarks"] = list()
 		#end if
 		local.db["bookmarks"].append(bookmark)
-		#local.save_db()
+		local.save()
 	#end define
 
 	def GetBookmarks(self):
@@ -3005,7 +3005,7 @@ def DeleteBookmark(self, name, type):
 			bookmarkName = bookmark.get("name")
 			if (type == bookmarkType and name == bookmarkName):
 				bookmarks.remove(bookmark)
-				#local.save_db()
+				local.save()
 				return
 		raise Exception("DeleteBookmark error: Bookmark not found")
 	#end define
@@ -3046,7 +3046,7 @@ def AddSaveOffer(self, offer):
 		saveOffers = self.GetSaveOffers()
 		if offerHash not in saveOffers:
 			saveOffers[offerHash] = offerPseudohash
-			#local.save_db()
+			local.save()
 	#end define
 
 	def GetVotedComplaints(self):
@@ -3063,7 +3063,7 @@ def AddVotedComplaints(self, complaint):
 		votedComplaints = self.GetVotedComplaints()
 		if pseudohash not in votedComplaints:
 			votedComplaints[pseudohash] = complaint
-			#local.save_db()
+			local.save()
 	#end define
 
 	def GetDestinationAddr(self, destination):
@@ -3222,7 +3222,7 @@ def SetSettings(self, name, data):
 			data = json.loads(data)
 		except: pass
 		local.db[name] = data
-		#local.save_db()
+		local.save()
 	#end define
 
 	def Tlb2Json(self, text):
@@ -3455,17 +3455,17 @@ def DepositToPool(self, walletName, poolAddr, amount):
 		self.SendFile(resultFilePath, wallet)
 	#end define
 
-	def WithdrawFromPool(self, walletName, poolAddr, amount):
+	def WithdrawFromPool(self, poolAddr, amount):
 		poolData = self.GetPoolData(poolAddr)
 		if poolData["state"] == 0:
-			self.WithdrawFromPoolProcess(walletName, poolAddr, amount)
+			self.WithdrawFromPoolProcess(poolAddr, amount)
 		else:
-			self.PendWithdrawFromPool(walletName, poolAddr, amount)
+			self.PendWithdrawFromPool(poolAddr, amount)
 	#end define
 
-	def WithdrawFromPoolProcess(self, walletName, poolAddr, amount):
+	def WithdrawFromPoolProcess(self, poolAddr, amount):
 		local.add_log("start WithdrawFromPoolProcess function", "debug")
-		wallet = self.GetLocalWallet(walletName)
+		wallet = self.GetValidatorWallet()
 		bocPath = local.buffer.my_temp_dir + wallet.name + "validator-withdraw-query.boc"
 		fiftScript = self.contractsDir + "nominator-pool/func/validator-withdraw.fif"
 		args = [fiftScript, amount, bocPath]
@@ -3474,16 +3474,16 @@ def WithdrawFromPoolProcess(self, walletName, poolAddr, amount):
 		self.SendFile(resultFilePath, wallet)
 	#end define
 
-	def PendWithdrawFromPool(self, walletName, poolAddr, amount):
+	def PendWithdrawFromPool(self, poolAddr, amount):
 		local.add_log("start PendWithdrawFromPool function", "debug")
 		pendingWithdraws = self.GetPendingWithdraws()
-		pendingWithdraws[poolAddr] = (walletName, amount)
-		#local.save_db()
+		pendingWithdraws[poolAddr] = amount
+		local.save()
 	#end define
 
 	def HandlePendingWithdraw(self, pendingWithdraws, poolAddr):
-		walletName, amount = pendingWithdraws.get(poolAddr)
-		self.WithdrawFromPoolProcess(walletName, poolAddr, amount)
+		amount = pendingWithdraws.get(poolAddr)
+		self.WithdrawFromPoolProcess(poolAddr, amount)
 		pendingWithdraws.pop(poolAddr)
 	#end define
 
@@ -3739,7 +3739,7 @@ def EnableVcEvent():
 	local.db["adnlAddr"] = adnlAddr
 
 	# Сохранить
-	#local.save_db()
+	local.save()
 #end define
 
 def ValidatorDownEvent():
@@ -3762,7 +3762,7 @@ def Statistics():
 	ReadNetworkData()
 	SaveNetworkStatistics()
 	#ReadTransData(scanner)
-	#SaveTransStatistics()
+	SaveTransStatistics()
 	ReadDiskData()
 	SaveDiskStatistics()
 #end define

mytoncore.py

@@ -1141,14 +1141,12 @@ def DepositToPool(args):
 
 def WithdrawFromPool(args):
 	try:
-		walletName = args[0]
-		poolAddr = args[1]
-		amount = float(args[2])
+		poolAddr = args[0]
+		amount = float(args[1])
 	except:
-		color_print("{red}Bad args. Usage:{endc} withdraw_from_pool <wallet-name> <pool-addr> <amount>")
+		color_print("{red}Bad args. Usage:{endc} withdraw_from_pool <pool-addr> <amount>")
 		return
-	poolAddr = ton.GetDestinationAddr(poolAddr)
-	ton.WithdrawFromPool(walletName, poolAddr, amount)
+	ton.WithdrawFromPool(poolAddr, amount)
 	color_print("WithdrawFromPool - {green}OK{endc}")
 #end define