Merge 0abb44852f3724a9a93d9cf90f92a05f518c7bf7 into a00211e8d8dbeeacc3b44b934f48e8d25bf36245

ComputeExamples.md

@@ -274,6 +274,7 @@ let resolvedDatasetDdo: DDO
 let resolvedAlgorithmDdo: DDO
 
 let computeJobId: string
+let agreementId: string
 ```
 
 ### 4.3 Helper methods
@@ -654,13 +655,18 @@ Let's have 5 minute of compute access
       algo
     )
 
+    console.log('COMPUTE JOBS', computeJobs)
+
 ```
 <!--
     assert(computeJobs, 'Cannot start compute job')
 -->
-Let's save the compute job it, we re going to use later
+Let's save the compute job id, we re going to use later
+We can also save the agreementId. Its another optional field that we can later use to retrieve the job status
 ```Typescript
     computeJobId = computeJobs[0].jobId
+    // eslint-disable-next-line prefer-destructuring
+    agreementId = computeJobs[0].agreementId
   
 ```
 
@@ -672,7 +678,7 @@ You can also add various delays so you see the various states of the compute job
       providerUrl,
       await consumerAccount.getAddress(),
       computeJobId,
-      DATASET_DDO.id
+      agreementId
     )
 ```
 <!--

docs/classes/Provider.md

@@ -128,9 +128,9 @@ ___
 
 ### computeStatus
 
-▸ **computeStatus**(`providerUri`, `consumerAddress`, `jobId?`, `did?`, `signal?`): `Promise`<[`ComputeJob`](../interfaces/ComputeJob.md) \| [`ComputeJob`](../interfaces/ComputeJob.md)[]\>
+▸ **computeStatus**(`providerUri`, `consumerAddress`, `jobId?`, `agreementId?`, `signal?`): `Promise`<[`ComputeJob`](../interfaces/ComputeJob.md) \| [`ComputeJob`](../interfaces/ComputeJob.md)[]\>
 
-Get compute status for a specific jobId/documentId/owner.
+Get compute status for a specific jobId/agreementId/owner.
 
 #### Parameters
 
@@ -139,7 +139,7 @@ Get compute status for a specific jobId/documentId/owner.
 | `providerUri` | `string` | The URI of the provider we want to query |
 | `consumerAddress` | `string` | The consumer ethereum address |
 | `jobId?` | `string` | The ID of a compute job. |
-| `did?` | `string` | The ID of the asset |
+| `agreementId?` | `string` | The ID of service agreement |
 | `signal?` | `AbortSignal` | abort signal |
 
 #### Returns

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@oceanprotocol/lib",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@oceanprotocol/lib",
-      "version": "3.3.1",
+      "version": "3.3.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@oceanprotocol/contracts": "^2.0.3",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",

src/services/Provider.ts

@@ -688,7 +688,7 @@ export class Provider {
    * @param {string} providerUri The URI of the provider we want to query
    * @param {string} consumerAddress The consumer ethereum address
    * @param {string} jobId The ID of a compute job.
-   * @param {string} did The ID of the asset
+   * @param {string} agreementId The ID of the service agreement (tx id)
    * @param {AbortSignal} signal abort signal
    * @return {Promise<ComputeJob | ComputeJob[]>}
    */
@@ -696,7 +696,7 @@ export class Provider {
     providerUri: string,
     consumerAddress: string,
     jobId?: string,
-    did?: string,
+    agreementId?: string,
     signal?: AbortSignal
   ): Promise<ComputeJob | ComputeJob[]> {
     const providerEndpoints = await this.getEndpoints(providerUri)
@@ -709,7 +709,7 @@ export class Provider {
       : null
 
     let url = `?consumerAddress=${consumerAddress}`
-    url += (did && `&documentId=${this.noZeroX(did)}`) || ''
+    url += (agreementId && `&agreementId=${this.noZeroX(agreementId)}`) || ''
     url += (jobId && `&jobId=${jobId}`) || ''
 
     if (!computeStatusUrl) return null

test/integration/ComputeExamples.test.ts

@@ -274,6 +274,7 @@ let resolvedDatasetDdo: DDO
 let resolvedAlgorithmDdo: DDO
 
 let computeJobId: string
+let agreementId: string
 /// ```
 
 /// ### 4.3 Helper methods
@@ -661,6 +662,8 @@ describe('Compute-to-data example tests', async () => {
     /// Let's save the compute job it, we re going to use later
     /// ```Typescript
     computeJobId = computeJobs[0].jobId
+    // eslint-disable-next-line prefer-destructuring
+    agreementId = computeJobs[0].agreementId
   }) ///
   /// ```
 
@@ -672,7 +675,7 @@ describe('Compute-to-data example tests', async () => {
       providerUrl,
       await consumerAccount.getAddress(),
       computeJobId,
-      DATASET_DDO.id
+      agreementId
     )
     /// ```
     /// <!--