Merge pull request #508 from oceanprotocol/issue-506-agreementid-stop

Issue 506 agreementid stop
oceanprotocol · Aug 14, 2024 · 3887055 · 3887055
2 parents 9319b6f + cddadc1
commit 3887055
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/src/@types/C2D.ts b/src/@types/C2D.ts
@@ -169,6 +169,7 @@ export interface OPFK8ComputeStart {
 export interface OPFK8ComputeStop {
   jobId: string
   owner: string
+  agreementId?: string
   providerSignature: string //  message=owner+jobId
   providerAddress: string
   nonce: number

diff --git a/src/@types/commands.ts b/src/@types/commands.ts
@@ -173,6 +173,7 @@ export interface ComputeStopCommand extends Command {
   signature: string
   nonce: string
   jobId: string
+  agreementId?: string
 }
 
 export interface ComputeGetResultCommand extends Command {

diff --git a/src/components/c2d/compute_engines.ts b/src/components/c2d/compute_engines.ts
@@ -291,7 +291,8 @@ export class C2DEngineOPFK8 extends C2DEngine {
 
   public override async stopComputeJob(
     jobId: string,
-    owner: string
+    owner: string,
+    agreementId?: string
   ): Promise<ComputeJob[]> {
     // and the full payload
     const nonce: number = new Date().getTime()
@@ -303,7 +304,8 @@ export class C2DEngineOPFK8 extends C2DEngine {
       providerSignature,
       providerAddress: config.keys.ethAddress,
       nonce,
-      jobId
+      jobId,
+      agreementId
     }
     try {
       const response = await axios({

diff --git a/src/components/core/compute/stopCompute.ts b/src/components/core/compute/stopCompute.ts
@@ -40,6 +40,8 @@ export class ComputeStopHandler extends Handler {
       const index = task.jobId.indexOf('-')
       const hash = task.jobId.slice(0, index)
       const jobId = task.jobId.slice(index + 1)
+      // eslint-disable-next-line prefer-destructuring
+      const agreementId = task.agreementId
 
       // env might contain
       let engine
@@ -54,7 +56,11 @@ export class ComputeStopHandler extends Handler {
           }
         }
       }
-      const response = await engine.stopComputeJob(jobId, task.consumerAddress)
+      const response = await engine.stopComputeJob(
+        jobId,
+        task.consumerAddress,
+        agreementId
+      )
 
       CORE_LOGGER.logMessage(
         'StopComputeCommand Response: ' + JSON.stringify(response, null, 2),

diff --git a/src/components/httpRoutes/compute.ts b/src/components/httpRoutes/compute.ts
@@ -125,11 +125,12 @@ computeRoutes.put(`${SERVICES_API_BASE_PATH}/compute`, async (req, res) => {
 
     const stopComputeTask: ComputeStopCommand = {
       command: PROTOCOL_COMMANDS.COMPUTE_STOP,
-      node: (req.body.node as string) || null,
-      consumerAddress: (req.body.consumerAddress as string) || null,
-      signature: (req.body.signature as string) || null,
-      nonce: (req.body.nonce as string) || null,
-      jobId: (req.body.jobId as string) || null
+      node: (req.query.node as string) || null,
+      consumerAddress: (req.query.consumerAddress as string) || null,
+      signature: (req.query.signature as string) || null,
+      nonce: (req.query.nonce as string) || null,
+      jobId: (req.query.jobId as string) || null,
+      agreementId: (req.query.agreementId as string) || null
     }
     const response = await new ComputeStopHandler(req.oceanNode).handle(stopComputeTask)
     const jobs = await streamToObject(response.stream as Readable)