Herman/Yiqun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update submission and routes (add pr to fit latest scope)

Browse Source
This commit is contained in:
HermanL02
2025-05-05 16:13:24 -03:00
parent 84866d3260
commit 4f020a2119
2 changed files with 97 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
worker/src/task/2-submission.ts
View File

@ -1,7 +1,8 @@
import { storeFile } from "../utils/ipfs"; import { storeFile } from "../utils/ipfs";
import { getOrcaClient } from "@_koii/task-manager/extensions"; import { getOrcaClient } from "@_koii/task-manager/extensions";
import { namespaceWrapper, TASK_ID } from "@_koii/namespace-wrapper"; import { namespaceWrapper, TASK_ID } from "@_koii/namespace-wrapper";
import { status } from "../utils/constant"; import { middleServerUrl, status } from "../utils/constant";
import { preRunCheck } from "../utils/check/checks";
export async function submission(roundNumber: number) : Promise<string | void> { export async function submission(roundNumber: number) : Promise<string | void> {
/** /**
* Retrieve the task proofs from your container and submit for auditing * Retrieve the task proofs from your container and submit for auditing
@ -9,6 +10,18 @@ export async function submission(roundNumber: number) : Promise<string | void> {
* The default implementation handles uploading the proofs to IPFS * The default implementation handles uploading the proofs to IPFS
* and returning the CID * and returning the CID
*/ */
if(!await preRunCheck(roundNumber.toString())){
return;
}
const stakingKeypair = await namespaceWrapper.getSubmitterAccount();
const pubKey = await namespaceWrapper.getMainAccountPubkey();
if (!stakingKeypair || !pubKey) {
console.error("[SUBMISSION] No staking keypair or public key found");
throw new Error("No staking keypair or public key found");
}
const stakingKey = stakingKeypair.publicKey.toBase58();
const secretKey = stakingKeypair.secretKey;
console.log(`[SUBMISSION] Starting submission process for round ${roundNumber}`); console.log(`[SUBMISSION] Starting submission process for round ${roundNumber}`);
try { try {
@ -22,88 +35,88 @@ export async function submission(roundNumber: number) : Promise<string | void> {
console.log(`[SUBMISSION] Fetching task result for round ${roundNumber}...`); console.log(`[SUBMISSION] Fetching task result for round ${roundNumber}...`);
const shouldMakeSubmission = await namespaceWrapper.storeGet(`shouldMakeSubmission`); const shouldMakeSubmission = await namespaceWrapper.storeGet(`shouldMakeSubmission`);
if (!shouldMakeSubmission || shouldMakeSubmission !== "true") { if (!shouldMakeSubmission || shouldMakeSubmission !== "true") {
const taskResult = await namespaceWrapper.storeGet(`result-${roundNumber}`); return;
if (!taskResult) {
console.log("[SUBMISSION] No task result found for this round");
return status.NO_DATA_FOR_THIS_ROUND;
}
return taskResult;
} }
const submissionRoundNumber = await namespaceWrapper.storeGet(`submissionRoundNumber`);
if (!submissionRoundNumber) { const cid = await makeSubmission({orcaClient, roundNumber, stakingKey, publicKey: pubKey, secretKey});
console.log("[SUBMISSION] No submission Round Number found for this round");
return status.NO_DATA_FOR_THIS_ROUND;
}
console.log(`[SUBMISSION] Fetching submission data for round ${roundNumber}. and submission roundnumber ${submissionRoundNumber}`);
const result = await orcaClient.podCall(`submission/${submissionRoundNumber}`);
let submission;
console.log("[SUBMISSION] Submission result:", result);
console.log("[SUBMISSION] Submission result data:", result.data);
if (!result || result.data === "No submission") {
console.log("[SUBMISSION] No existing submission found");
return status.NO_SUBMISSION_BUT_SUBMISSION_CALLED;
} else {
// Add extra error handling for https://koii-workspace.slack.com/archives/C0886H01JM8/p1746137232538419
if (typeof result.data === 'object' && 'data' in result.data) {
console.log("[SUBMISSION] Submission result data is an object with 'data' property");
submission = result.data.data;
} else {
console.log("[SUBMISSION] Submission result data is not an object with 'data' property");
submission = result.data;
}
}
console.log("[SUBMISSION] Validating submission data...");
console.log("[SUBMISSION] Submission data:", submission);
if (submission.roundNumber !== roundNumber) {
console.error(`[SUBMISSION] Round number mismatch. Expected: ${roundNumber}, Got: ${submission.roundNumber}`);
throw new Error("Submission is not for the current round");
}
if (!submission.prUrl) {
console.error("[SUBMISSION] Missing PR URL in submission");
throw new Error("Submission is missing PR URL");
}
console.log("[SUBMISSION] Submission data validated successfully:", submission);
console.log("[SUBMISSION] Getting submitter account...");
const stakingKeypair = await namespaceWrapper.getSubmitterAccount();
if (!stakingKeypair) {
console.error("[SUBMISSION] No staking keypair found");
throw new Error("No staking keypair found");
}
console.log("[SUBMISSION] Submitter account retrieved successfully");
const stakingKey = stakingKeypair.publicKey.toBase58();
const pubKey = await namespaceWrapper.getMainAccountPubkey();
console.log("[SUBMISSION] Staking key:", stakingKey);
console.log("[SUBMISSION] Public key:", pubKey);
console.log("[SUBMISSION] Signing submission payload...");
const signature = await namespaceWrapper.payloadSigning(
{
taskId: TASK_ID,
roundNumber,
stakingKey,
pubKey,
action: "audit",
...submission,
},
stakingKeypair.secretKey,
);
console.log("[SUBMISSION] Payload signed successfully");
console.log("[SUBMISSION] Storing submission on IPFS...");
const cid = await storeFile({ signature }, "submission.json");
console.log("[SUBMISSION] Submission stored successfully. CID:", cid);
// If done please set the shouldMakeSubmission to false
await namespaceWrapper.storeSet(`shouldMakeSubmission`, "false");
return cid || void 0; return cid || void 0;
} catch (error) { } catch (error) {
console.error("[SUBMISSION] Error during submission process:", error); console.error("[SUBMISSION] Error during submission process:", error);
throw error; throw error;
} }
}
async function makeSubmission({orcaClient, roundNumber, stakingKey, publicKey, secretKey}: {orcaClient: any, roundNumber: number, stakingKey: string, publicKey: string, secretKey: Uint8Array<ArrayBufferLike>}) {
const swarmBountyId = await namespaceWrapper.storeGet(`swarmBountyId`);
if (!swarmBountyId) {
console.log("[SUBMISSION] No swarm bounty id found for this round");
return;
}
console.log(`[SUBMISSION] Fetching submission data for round ${roundNumber}. and submission roundnumber ${swarmBountyId}`);
const result = await orcaClient.podCall(`submission/${swarmBountyId}`);
let submission;
console.log("[SUBMISSION] Submission result:", result);
console.log("[SUBMISSION] Submission result data:", result.data);
if (!result || result.data === "No submission") {
console.log("[SUBMISSION] No existing submission found");
return;
} else {
// Add extra error handling for https://koii-workspace.slack.com/archives/C0886H01JM8/p1746137232538419
if (typeof result.data === 'object' && 'data' in result.data) {
console.log("[SUBMISSION] Submission result data is an object with 'data' property");
submission = result.data.data;
} else {
console.log("[SUBMISSION] Submission result data is not an object with 'data' property");
submission = result.data;
}
}
if (!submission.prUrl) {
console.error("[SUBMISSION] Missing PR URL in submission");
throw new Error("Submission is missing PR URL");
}
const middleServerPayload = {
taskId: TASK_ID,
swarmBountyId,
prUrl: submission.prUrl,
stakingKey,
publicKey,
action: "add-round-number",
};
const middleServerSignature = await namespaceWrapper.payloadSigning(middleServerPayload, secretKey);
const middleServerResponse = await fetch(`${middleServerUrl}/summarizer/worker/add-round-number`, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({ signature: middleServerSignature, stakingKey: stakingKey }),
});
console.log("[TASK] Add PR Response: ", middleServerResponse);
if (middleServerResponse.status !== 200) {
throw new Error(`Posting to middle server failed: ${middleServerResponse.statusText}`);
}
const signature = await namespaceWrapper.payloadSigning(
{
taskId: TASK_ID,
roundNumber,
stakingKey,
pubKey:publicKey,
// action: "audit",
...submission,
},
secretKey,
);
console.log("[SUBMISSION] Payload signed successfully");
console.log("[SUBMISSION] Storing submission on IPFS...");
const cid = await storeFile({ signature }, "submission.json");
console.log("[SUBMISSION] Submission stored successfully. CID:", cid);
// If done please set the shouldMakeSubmission to false
await namespaceWrapper.storeSet(`shouldMakeSubmission`, "false");
await namespaceWrapper.storeSet(`swarmBountyId`, "");
return cid;
} }

32
worker/src/task/5-routes.ts
View File

@ -14,6 +14,7 @@ import { middleServerUrl, status } from "../utils/constant";
//Example route //Example route
export async function routes() { export async function routes() {
app.get("/value", async (_req, res) => { app.get("/value", async (_req, res) => {
const value = await namespaceWrapper.storeGet("value"); const value = await namespaceWrapper.storeGet("value");
console.log("value", value); console.log("value", value);
@ -58,31 +59,15 @@ export async function routes() {
app.post("/add-todo-pr", async (req, res) => { app.post("/add-todo-pr", async (req, res) => {
const signature = req.body.signature; const signature = req.body.signature;
const prUrl = req.body.prUrl; const prUrl = req.body.prUrl;
// Modified round number not fetch from the input instead fetch from the namespace const swarmBountyId = req.body.swarmBountyId;
const roundNumber = parseInt(req.body.roundNumber);
const success = req.body.success; const success = req.body.success;
const message = req.body.message; const message = req.body.message;
console.log("[TASK] req.body", req.body); console.log("[TASK] req.body", req.body);
try { try {
if (!success){ if (!success){
// TODO: Need to call the server to cancel the task
// await namespaceWrapper.storeSet(`result-${roundNumber}`, status.ISSUE_SUMMARIZATION_FAILED);
// It cannot be round number based, becasue the current round might already missed the submission window
// await namespaceWrapper.storeSet(`result-${roundNumber}`, status.ISSUE_SUMMARIZATION_FAILED);
console.error("[TASK] Error summarizing repository:", message); console.error("[TASK] Error summarizing repository:", message);
return; return;
} }
// const uuid = await namespaceWrapper.storeGet(`uuid-${roundNumber}`);
// console.log("[TASK] uuid: ", uuid);
// if (!uuid) {
// throw new Error("No uuid found");
// }
// const currentRound = await namespaceWrapper.getRound();
// if (roundNumber !== currentRound) {
// throw new Error(`Invalid round number: ${roundNumber}. Current round: ${currentRound}.`);
// }
const publicKey = await namespaceWrapper.getMainAccountPubkey(); const publicKey = await namespaceWrapper.getMainAccountPubkey();
const stakingKeypair = await namespaceWrapper.getSubmitterAccount(); const stakingKeypair = await namespaceWrapper.getSubmitterAccount();
@ -109,17 +94,10 @@ export async function routes() {
if (jsonData.taskId !== TASK_ID) { if (jsonData.taskId !== TASK_ID) {
throw new Error(`Invalid task ID from signature: ${jsonData.taskId}. Actual task ID: ${TASK_ID}`); throw new Error(`Invalid task ID from signature: ${jsonData.taskId}. Actual task ID: ${TASK_ID}`);
} }
// if (jsonData.roundNumber !== currentRound) {
// throw new Error(
// `Invalid round number from signature: ${jsonData.roundNumber}. Current round: ${currentRound}.`,
// );
// }
// if (jsonData.uuid !== uuid) {
// throw new Error(`Invalid uuid from signature: ${jsonData.uuid}. Actual uuid: ${uuid}`);
// }
const middleServerPayload = { const middleServerPayload = {
taskId: jsonData.taskId, taskId: jsonData.taskId,
roundNumber, swarmBountyId,
prUrl, prUrl,
stakingKey, stakingKey,
publicKey, publicKey,
@ -140,7 +118,7 @@ export async function routes() {
throw new Error(`Posting to middle server failed: ${middleServerResponse.statusText}`); throw new Error(`Posting to middle server failed: ${middleServerResponse.statusText}`);
} }
await namespaceWrapper.storeSet(`shouldMakeSubmission`, "true"); await namespaceWrapper.storeSet(`shouldMakeSubmission`, "true");
await namespaceWrapper.storeSet(`submissionRoundNumber`, roundNumber.toString()); await namespaceWrapper.storeSet(`swarmBountyId`, swarmBountyId.toString());
res.status(200).json({ result: "Successfully saved PR" }); res.status(200).json({ result: "Successfully saved PR" });
} catch (error) { } catch (error) {
console.error("[TASK] Error adding PR to summarizer todo:", error); console.error("[TASK] Error adding PR to summarizer todo:", error);