From 683329d28c38286382bacf500b006cae1bd3cde8 Mon Sep 17 00:00:00 2001 From: yungwine Date: Wed, 30 Oct 2024 14:46:26 +0400 Subject: [PATCH 1/2] rm deposit_to_pool and withdraw_from_pool cmds from single-nominator --- modules/nominator_pool.py | 38 ++++++++++++++++++++++++++++++++++++++ modules/pool.py | 38 -------------------------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/modules/nominator_pool.py b/modules/nominator_pool.py index 14f4fbdd..d00708b0 100644 --- a/modules/nominator_pool.py +++ b/modules/nominator_pool.py @@ -87,7 +87,45 @@ def update_validator_set(self, args): self.ton.PoolUpdateValidatorSet(pool_addr, wallet) color_print("UpdateValidatorSet - {green}OK{endc}") + def do_deposit_to_pool(self, pool_addr, amount): + wallet = self.ton.GetValidatorWallet() + bocPath = self.ton.local.buffer.my_temp_dir + wallet.name + "validator-deposit-query.boc" + fiftScript = self.ton.contractsDir + "nominator-pool/func/validator-deposit.fif" + args = [fiftScript, bocPath] + result = self.ton.fift.Run(args) + resultFilePath = self.ton.SignBocWithWallet(wallet, bocPath, pool_addr, amount) + self.ton.SendFile(resultFilePath, wallet) + + def deposit_to_pool(self, args): + try: + poll_addr = args[0] + amount = float(args[1]) + except: + color_print("{red}Bad args. Usage:{endc} deposit_to_pool ") + return + self.do_deposit_to_pool(poll_addr, amount) + color_print("DepositToPool - {green}OK{endc}") + + def do_withdraw_from_pool(self, pool_addr, amount): + pool_data = self.ton.GetPoolData(pool_addr) + if pool_data["state"] == 0: + self.ton.WithdrawFromPoolProcess(pool_addr, amount) + else: + self.ton.PendWithdrawFromPool(pool_addr, amount) + + def withdraw_from_pool(self, args): + try: + pool_addr = args[0] + amount = float(args[1]) + except: + color_print("{red}Bad args. Usage:{endc} withdraw_from_pool ") + return + self.do_withdraw_from_pool(pool_addr, amount) + color_print("WithdrawFromPool - {green}OK{endc}") + def add_console_commands(self, console): console.AddItem("new_pool", self.new_pool, self.local.translate("new_pool_cmd")) console.AddItem("activate_pool", self.activate_pool, self.local.translate("activate_pool_cmd")) console.AddItem("update_validator_set", self.update_validator_set, self.local.translate("update_validator_set_cmd")) + console.AddItem("withdraw_from_pool", self.withdraw_from_pool, self.local.translate("withdraw_from_pool_cmd")) + console.AddItem("deposit_to_pool", self.deposit_to_pool, self.local.translate("deposit_to_pool_cmd")) diff --git a/modules/pool.py b/modules/pool.py index ba37b16c..16b481c5 100644 --- a/modules/pool.py +++ b/modules/pool.py @@ -58,45 +58,7 @@ def check_download_pool_contract_scripts(self): if not os.path.isdir(contract_path): self.ton.DownloadContract("https://github.com/ton-blockchain/nominator-pool") - def do_deposit_to_pool(self, pool_addr, amount): - wallet = self.ton.GetValidatorWallet() - bocPath = self.ton.local.buffer.my_temp_dir + wallet.name + "validator-deposit-query.boc" - fiftScript = self.ton.contractsDir + "nominator-pool/func/validator-deposit.fif" - args = [fiftScript, bocPath] - result = self.ton.fift.Run(args) - resultFilePath = self.ton.SignBocWithWallet(wallet, bocPath, pool_addr, amount) - self.ton.SendFile(resultFilePath, wallet) - - def deposit_to_pool(self, args): - try: - poll_addr = args[0] - amount = float(args[1]) - except: - color_print("{red}Bad args. Usage:{endc} deposit_to_pool ") - return - self.do_deposit_to_pool(poll_addr, amount) - color_print("DepositToPool - {green}OK{endc}") - - def do_withdraw_from_pool(self, pool_addr, amount): - pool_data = self.ton.GetPoolData(pool_addr) - if pool_data["state"] == 0: - self.ton.WithdrawFromPoolProcess(pool_addr, amount) - else: - self.ton.PendWithdrawFromPool(pool_addr, amount) - - def withdraw_from_pool(self, args): - try: - pool_addr = args[0] - amount = float(args[1]) - except: - color_print("{red}Bad args. Usage:{endc} withdraw_from_pool ") - return - self.do_withdraw_from_pool(pool_addr, amount) - color_print("WithdrawFromPool - {green}OK{endc}") - def add_console_commands(self, console): console.AddItem("pools_list", self.print_pools_list, self.local.translate("pools_list_cmd")) console.AddItem("delete_pool", self.delete_pool, self.local.translate("delete_pool_cmd")) console.AddItem("import_pool", self.import_pool, self.local.translate("import_pool_cmd")) - console.AddItem("deposit_to_pool", self.deposit_to_pool, self.local.translate("deposit_to_pool_cmd")) - console.AddItem("withdraw_from_pool", self.withdraw_from_pool, self.local.translate("withdraw_from_pool_cmd")) From d4d1b4616104524d22f0397d1cc335f016b847c8 Mon Sep 17 00:00:00 2001 From: yungwine Date: Wed, 30 Oct 2024 15:16:53 +0400 Subject: [PATCH 2/2] add stake to vl --- modules/utilities.py | 5 +++-- mytoncore/mytoncore.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/utilities.py b/modules/utilities.py index da108152..62c83efb 100644 --- a/modules/utilities.py +++ b/modules/utilities.py @@ -313,13 +313,14 @@ def print_validator_list(self, args): print(text) else: table = list() - table += [["id", "ADNL", "Pubkey", "Wallet", "Efficiency", "Online"]] + table += [["id", "ADNL", "Pubkey", "Wallet", "Stake", "Efficiency", "Online"]] for i, item in enumerate(data): adnl = item.get("adnlAddr") pubkey = item.get("pubkey") walletAddr = item.get("walletAddr") efficiency = item.get("efficiency") online = item.get("online") + stake = item.get("stake") if "adnl" not in args: adnl = self.reduct(adnl) if "pubkey" not in args: @@ -332,7 +333,7 @@ def print_validator_list(self, args): online = bcolors.green_text("true") if not online: online = bcolors.red_text("false") - table += [[str(i), adnl, pubkey, walletAddr, efficiency, online]] + table += [[str(i), adnl, pubkey, walletAddr, stake, efficiency, online]] print_table(table) # end define diff --git a/mytoncore/mytoncore.py b/mytoncore/mytoncore.py index 76cf58cd..4c4491fa 100644 --- a/mytoncore/mytoncore.py +++ b/mytoncore/mytoncore.py @@ -2490,6 +2490,7 @@ def GetValidatorsList(self, past=False, fast=False, start=None, end=None): validator["efficiency"] = round(validator["wr"] * 100, 2) if saveElectionEntries and adnlAddr in saveElectionEntries: validator["walletAddr"] = saveElectionEntries[adnlAddr]["walletAddr"] + validator["stake"] = saveElectionEntries[adnlAddr].get("stake") #end for # Set buffer