coosld/client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add last TIG changes

Browse Source
This commit is contained in:
François Patron 2024-12-28 17:38:21 +01:00
parent 8862d951b3
commit b801f9bf82
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tig-benchmarker/slave.py
View File

@ -10,7 +10,7 @@ import time
import zlib
from threading import Thread
from common.structs import OutputData, MerkleProof
from common.merkle_tree import MerkleTree
from common.merkle_tree import MerkleTree, MerkleHash
from datetime import datetime, timedelta
logger = logging.getLogger(os.path.splitext(os.path.basename(__file__))[0])
@ -97,7 +97,11 @@ def send_results(session, master_ip, master_port, tig_worker_path, download_wasm
try:
batch_id = READY_BATCH_IDS.pop()
except KeyError:
logger.debug("No pending batches")
logger.debug("No batches to send")
return
if now() - FINISHED_BATCH_IDS.get(batch_id, 0) < 10000:
logger.debug(f"Batch {batch_id} submitted recently")
return
output_folder = f"{output_path}/{batch_id}"
@ -107,6 +111,7 @@ def send_results(session, master_ip, master_port, tig_worker_path, download_wasm
if (
not os.path.exists(f"{output_folder}/result.json")
or not os.path.exists(f"{output_folder}/data.zlib")
or not os.path.exists(f"{output_folder}/hashes.zlib")
):
if os.path.exists(f"{output_folder}/result.json"):
os.remove(f"{output_folder}/result.json")
@ -132,22 +137,21 @@ def send_results(session, master_ip, master_port, tig_worker_path, download_wasm
READY_BATCH_IDS.add(batch_id) # requeue
else:
with open(f"{output_folder}/hashes.zlib", "rb") as f:
hashes = json.loads(zlib.decompress(f.read()).decode())
with open(f"{output_folder}/data.zlib", "rb") as f:
leafs = [
OutputData.from_dict(x)
for x in json.loads(zlib.decompress(f.read()).decode())
]
leafs = json.loads(zlib.decompress(f.read()).decode())
merkle_tree = MerkleTree(
[x.to_merkle_hash() for x in leafs],
[MerkleHash.from_str(x) for x in hashes],
batch["batch_size"]
)
proofs_to_submit = [
MerkleProof(
dict(
leaf=leafs[n - batch["start_nonce"]],
branch=merkle_tree.calc_merkle_branch(branch_idx=n - batch["start_nonce"])
).to_dict()
branch=merkle_tree.calc_merkle_branch(branch_idx=n - batch["start_nonce"]).to_str()
)
for n in batch["sampled_nonces"]
]