Skip to content

Add Node name for safe parallel execution #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 7, 2020
Merged

Add Node name for safe parallel execution #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
511358f
Add Node name for safe parallel execution
Jul 6, 2020
23c7cdf
Add underscore to node name for better file system names
Jul 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions mytoncore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ def __init__(self):
self.adnlAddr = None
self.tempDir = None
self.validatorWalletName = None
self.nodeName = None

self.liteClient = LiteClient()
self.validatorConsole = ValidatorConsole()
Expand Down Expand Up @@ -169,6 +170,11 @@ def Refresh(self):

self.adnlAddr = local.db.get("adnlAddr")
self.validatorWalletName = local.db.get("validatorWalletName")
self.nodeName = local.db.get("nodeName")
if self.nodeName is None:
self.nodeName=""
else:
self.nodeName = self.nodeName + "_"

liteClient = local.db.get("liteClient")
if liteClient is not None:
Expand Down Expand Up @@ -660,7 +666,7 @@ def AttachAdnlAddrToValidator(self, adnlAddr, key, endWorkTime):

def CreateConfigProposalRequest(self, offerHash, validatorIndex):
local.AddLog("start CreateConfigProposalRequest function", "debug")
fileName = self.tempDir + "_validator-to-sign.req"
fileName = self.tempDir + self.nodeName + "_validator-to-sign.req"
args = ["config-proposal-vote-req.fif", "-i", validatorIndex, offerHash]
result = self.fift.Run(args)
fileName = Pars(result, "Saved to file ", '\n')
Expand All @@ -678,7 +684,7 @@ def CreateConfigProposalRequest(self, offerHash, validatorIndex):

def CreateElectionRequest(self, wallet, startWorkTime, adnlAddr, maxFactor):
local.AddLog("start CreateElectionRequest function", "debug")
fileName = self.tempDir + str(startWorkTime) + "_validator-to-sign.bin"
fileName = self.tempDir + self.nodeName + str(startWorkTime) + "_validator-to-sign.bin"
args = ["validator-elect-req.fif", wallet.addr, startWorkTime, maxFactor, adnlAddr, fileName]
result = self.fift.Run(args)
fileName = Pars(result, "Saved to file ", '\n')
Expand All @@ -704,7 +710,7 @@ def GetValidatorSignature(self, validatorKey, var1):

def SignElectionRequestWithValidator(self, wallet, startWorkTime, adnlAddr, validatorPubkey_b64, validatorSignature, maxFactor):
local.AddLog("start SignElectionRequestWithValidator function", "debug")
fileName = self.tempDir + str(startWorkTime) + "_validator-query.boc"
fileName = self.tempDir + self.nodeName + str(startWorkTime) + "_validator-query.boc"
args = ["validator-elect-signed.fif", wallet.addr, startWorkTime, maxFactor, adnlAddr, validatorPubkey_b64, validatorSignature, fileName]
result = self.fift.Run(args)
validatorPubkey = Pars(result, "validator public key ", '\n')
Expand All @@ -715,7 +721,7 @@ def SignElectionRequestWithValidator(self, wallet, startWorkTime, adnlAddr, vali
def SignFileWithWallet(self, wallet, filePath, addr, gram):
local.AddLog("start SignFileWithWallet function", "debug")
seqno = self.GetSeqno(wallet)
resultFilePath = self.tempDir + wallet.name + "_wallet-query"
resultFilePath = self.tempDir + self.nodeName + wallet.name + "_wallet-query"
args = ["wallet.fif", wallet.path, addr, seqno, gram, "-B", filePath, resultFilePath]
result = self.fift.Run(args)
resultFilePath = Pars(result, "Saved to file ", ")")
Expand Down Expand Up @@ -753,7 +759,7 @@ def GetReturnedStake(self, fullElectorAddr, wallet):

def RecoverStake(self):
local.AddLog("start RecoverStake function", "debug")
resultFilePath = self.tempDir + "recover-query"
resultFilePath = self.tempDir + self.nodeName + "recover-query"
args = ["recover-stake.fif", resultFilePath]
result = self.fift.Run(args)
resultFilePath = Pars(result, "Saved to file ", '\n')
Expand Down Expand Up @@ -878,7 +884,7 @@ def ReturnStake(self):

def SaveElectionVarsToJsonFile(self, **kwargs):
local.AddLog("start SaveElectionVarsToJsonFile function", "debug")
fileName = self.tempDir + str(kwargs.get("startWorkTime")) + "_ElectionEntry.json"
fileName = self.tempDir + self.nodeName + str(kwargs.get("startWorkTime")) + "_ElectionEntry.json"
wallet = kwargs.get("wallet")
account = kwargs.get("account")
arr = {"wallet":wallet.__dict__, "account":account.__dict__}
Expand Down Expand Up @@ -1156,7 +1162,7 @@ def GetOffers(self):

def SignProposalVoteRequestWithValidator(self, offerHash, validatorIndex, validatorPubkey_b64, validatorSignature):
local.AddLog("start SignProposalVoteRequestWithValidator function", "debug")
fileName = self.tempDir + "_vote-msg-body.boc"
fileName = self.tempDir + self.nodeName + "_vote-msg-body.boc"
args = ["config-proposal-vote-signed.fif", "-i", validatorIndex, offerHash, validatorPubkey_b64, validatorSignature, fileName]
result = self.fift.Run(args)
fileName = Pars(result, "Saved to file ", '\n')
Expand Down Expand Up @@ -1291,7 +1297,7 @@ def NewDomain(self, domain):
raise Exception("NewDomain error: domain is busy")
#end if

fileName = self.tempDir + "_dns-msg-body.boc"
fileName = self.tempDir + self.nodeName + "_dns-msg-body.boc"
args = ["auto-dns.fif", dnsAddr, "add", subdomain, expireInSec, "owner", wallet.addr, "cat", catId, "adnl", domain["adnlAddr"], "-o", fileName]
result = self.fift.Run(args)
resultFilePath = Pars(result, "Saved to file ", ')')
Expand Down