From 0a130ee424bfedd261ce5900f91b337b4e816db6 Mon Sep 17 00:00:00 2001 From: yungwine Date: Thu, 15 Feb 2024 16:50:15 +0700 Subject: [PATCH 1/2] fix GetValidatorKey() --- mytoncore/mytoncore.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mytoncore/mytoncore.py b/mytoncore/mytoncore.py index 63c47e89..43b9b420 100644 --- a/mytoncore/mytoncore.py +++ b/mytoncore/mytoncore.py @@ -1911,12 +1911,13 @@ def MoveCoinsFromHW(self, wallet, destList, **kwargs): def GetValidatorKey(self): vconfig = self.GetValidatorConfig() - for validator in vconfig["validators"]: + validators = sorted(vconfig["validators"], key=lambda i: i['election_date'], reverse=True) + for validator in validators: validatorId = validator["id"] key_bytes = base64.b64decode(validatorId) validatorKey = key_bytes.hex().upper() timestamp = get_timestamp() - if timestamp > validator["election_date"]: + if validator["election_date"] < timestamp < validator["expire_at"]: return validatorKey raise Exception("GetValidatorKey error: validator key not found. Are you sure you are a validator?") #end define From c28197dbd2953794f82ef3f813fa1cb9bfe264ff Mon Sep 17 00:00:00 2001 From: yungwine Date: Thu, 15 Feb 2024 17:18:27 +0700 Subject: [PATCH 2/2] change duplicateApi default behaviour --- mytoncore/mytoncore.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mytoncore/mytoncore.py b/mytoncore/mytoncore.py index 43b9b420..f49a4eba 100644 --- a/mytoncore/mytoncore.py +++ b/mytoncore/mytoncore.py @@ -1205,7 +1205,8 @@ def SendFile(self, filePath, wallet=None, **kwargs): timeout = kwargs.get("timeout", 30) remove = kwargs.get("remove", True) duplicateSendfile = self.local.db.get("duplicateSendfile", True) - duplicateApi = self.local.db.get("duplicateApi", False) + telemetry = self.local.db.get("sendTelemetry", False) + duplicateApi = self.local.db.get("duplicateApi", telemetry) if not os.path.isfile(filePath): raise Exception("SendFile error: no such file '{filePath}'".format(filePath=filePath)) if timeout and wallet: