Skip to content

Commit

Permalink
Fix conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
mariacarmina committed Sep 24, 2024
2 parents 54e15f8 + eb6d84e commit a6620c9
Show file tree
Hide file tree
Showing 12 changed files with 247 additions and 153 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @mihaisc @kremalicious @alexcos20 @bogdanfazakas
* @mihaisc @alexcos20 @bogdanfazakas @paulo-ocean @mariacarmina @jamiehewitt15
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
with:
node-version: '20'
- name: Cache node_modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand Down Expand Up @@ -186,7 +186,6 @@ jobs:
- uses: actions/download-artifact@v4
with:
name: coverage-integration

- uses: paambaati/[email protected]
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
Expand Down
74 changes: 54 additions & 20 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,43 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v3.3.3](https://github.com/oceanprotocol/ocean.js/compare/v3.3.3-next.1...v3.3.3)

- make service endpoint / service name check case insensitive [`#1832`](https://github.com/oceanprotocol/ocean.js/pull/1832)

#### [v3.3.3-next.1](https://github.com/oceanprotocol/ocean.js/compare/v3.3.3-next.0...v3.3.3-next.1)

> 1 July 2024
- wip: update compute status/stop to support `agreementId`, not `documentId`, sig fix [`#1822`](https://github.com/oceanprotocol/ocean.js/pull/1822)
- put timeout back and test order,mut be ipfs side temporary [`557289e`](https://github.com/oceanprotocol/ocean.js/commit/557289e5f2c3a667abb6645a07c8342be881c186)
- try swap tests order , debug [`fb50bee`](https://github.com/oceanprotocol/ocean.js/commit/fb50bee3804d943949da33cfdfb615449d6c39c1)
- remove console.logs [`4e0536a`](https://github.com/oceanprotocol/ocean.js/commit/4e0536a1f8a812e4002b437665ce5357fddccd22)

#### [v3.3.3-next.0](https://github.com/oceanprotocol/ocean.js/compare/v3.3.2...v3.3.3-next.0)

> 27 June 2024
- Release 3.3.3-next.0 [`6f13fe7`](https://github.com/oceanprotocol/ocean.js/commit/6f13fe796feb9f168f234c8edf5ed27bcc47ce82)
- wip: update to support agreementId [`9d58208`](https://github.com/oceanprotocol/ocean.js/commit/9d582082f05cab961915aef04e74f8e32fd7ba9c)
- update compute stop, document id is not needed, neither for operator service, neither used on signature check [`5105a4f`](https://github.com/oceanprotocol/ocean.js/commit/5105a4fdadbf5590ebf2954a1d6f3a12f77b235c)

#### [v3.3.2](https://github.com/oceanprotocol/ocean.js/compare/v3.3.1...v3.3.2)

> 25 June 2024
- Split coupled tests to fix timeout issues [`#1827`](https://github.com/oceanprotocol/ocean.js/pull/1827)
- Bump braces from 3.0.2 to 3.0.3 [`#1819`](https://github.com/oceanprotocol/ocean.js/pull/1819)
- Bump chai-spies and @types/chai-spies [`#1816`](https://github.com/oceanprotocol/ocean.js/pull/1816)
- Pontus x devnet config [`#1806`](https://github.com/oceanprotocol/ocean.js/pull/1806)
- Update CODEOWNERS [`#1824`](https://github.com/oceanprotocol/ocean.js/pull/1824)
- Sanitize service endpoint by adding/reving slash when needed. [`#1821`](https://github.com/oceanprotocol/ocean.js/pull/1821)
- Release 3.3.2 [`3ba3ccb`](https://github.com/oceanprotocol/ocean.js/commit/3ba3ccb6b5df9caa87e31dfb316a1c1c74a6740c)

#### [v3.3.1](https://github.com/oceanprotocol/ocean.js/compare/v3.3.0...v3.3.1)

> 9 May 2024
- Bump express from 4.18.2 to 4.19.2 [`#1813`](https://github.com/oceanprotocol/ocean.js/pull/1813)
- Bump typescript from 5.1.6 to 5.4.5 [`#1810`](https://github.com/oceanprotocol/ocean.js/pull/1810)
- Bump ejs from 3.1.7 to 3.1.10 [`#1812`](https://github.com/oceanprotocol/ocean.js/pull/1812)
Expand All @@ -15,6 +50,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Bump es5-ext from 0.10.62 to 0.10.64 [`#1805`](https://github.com/oceanprotocol/ocean.js/pull/1805)
- Multiple fixes [`#1785`](https://github.com/oceanprotocol/ocean.js/pull/1785)
- Update ConfigHelper.ts [`#1807`](https://github.com/oceanprotocol/ocean.js/pull/1807)
- Release 3.3.1 [`1f4e433`](https://github.com/oceanprotocol/ocean.js/commit/1f4e4336dd64d8950a2b314a9de526b40fbe63f5)

#### [v3.3.0](https://github.com/oceanprotocol/ocean.js/compare/v3.2.3...v3.3.0)

Expand Down Expand Up @@ -72,29 +108,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- make sure we increment a number when working with nonces [`#1781`](https://github.com/oceanprotocol/ocean.js/pull/1781)
- Release 3.1.4 [`b2e2cf2`](https://github.com/oceanprotocol/ocean.js/commit/b2e2cf24293af07f597c25e3a3e392db9caa381a)

#### [v3.1.3](https://github.com/oceanprotocol/ocean.js/compare/v3.1.3-next.1...v3.1.3)
#### [v3.1.3](https://github.com/oceanprotocol/ocean.js/compare/v3.1.2...v3.1.3)

> 16 October 2023
- fix fs use & error handling [`#1777`](https://github.com/oceanprotocol/ocean.js/pull/1777)
- Bump postcss from 8.4.5 to 8.4.31 [`#1778`](https://github.com/oceanprotocol/ocean.js/pull/1778)
- Release 3.1.3 [`1bc5a39`](https://github.com/oceanprotocol/ocean.js/commit/1bc5a39fda217c91cf5c44f41c6275acd20740de)

#### [v3.1.3-next.1](https://github.com/oceanprotocol/ocean.js/compare/v3.1.3-next.0...v3.1.3-next.1)

> 11 October 2023
- update error handling [`aada8e9`](https://github.com/oceanprotocol/ocean.js/commit/aada8e92af9273ccc20e86dc00ea73bcb7e8dfdf)
- Release 3.1.3-next.1 [`40c22b9`](https://github.com/oceanprotocol/ocean.js/commit/40c22b9b1fa147fd4295da1bdd6248d7714a2b30)

#### [v3.1.3-next.0](https://github.com/oceanprotocol/ocean.js/compare/v3.1.2...v3.1.3-next.0)

> 6 October 2023
- Bump @types/crypto-js from 4.1.1 to 4.1.2 [`#1774`](https://github.com/oceanprotocol/ocean.js/pull/1774)
- Bump @types/chai-spies from 1.0.3 to 1.0.4 [`#1776`](https://github.com/oceanprotocol/ocean.js/pull/1776)
- fix fs use [`735dc2f`](https://github.com/oceanprotocol/ocean.js/commit/735dc2f62b976be683bc9fcd7f8940e715b18519)
- Release 3.1.3-next.0 [`5ac5d1f`](https://github.com/oceanprotocol/ocean.js/commit/5ac5d1f44a637b5d8d285757941b0393bb3a7983)
- Release 3.1.3 [`1bc5a39`](https://github.com/oceanprotocol/ocean.js/commit/1bc5a39fda217c91cf5c44f41c6275acd20740de)

#### [v3.1.2](https://github.com/oceanprotocol/ocean.js/compare/v3.1.1...v3.1.2)

Expand Down Expand Up @@ -572,17 +594,29 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Bump typedoc from 0.22.15 to 0.22.17 [`#1514`](https://github.com/oceanprotocol/ocean.js/pull/1514)
- Release 1.1.3 [`7772e93`](https://github.com/oceanprotocol/ocean.js/commit/7772e9387ef9d63f98ea80cfd4eefbea963dd0ad)

#### [v1.1.2](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0...v1.1.2)
#### [v1.1.2](https://github.com/oceanprotocol/ocean.js/compare/v1.1.1...v1.1.2)

> 15 June 2022
- Release 1.1.2 [`85bf271`](https://github.com/oceanprotocol/ocean.js/commit/85bf2716e26d8691aeb9d5504e563d557419dc2e)
- manual bump fix [`5674a54`](https://github.com/oceanprotocol/ocean.js/commit/5674a547d1d367ce88b3595f0be8ebbf12274266)

#### [v1.1.1](https://github.com/oceanprotocol/ocean.js/compare/v1.1.0...v1.1.1)

> 15 June 2022
- Release 1.1.1 [`ea48e01`](https://github.com/oceanprotocol/ocean.js/commit/ea48e015ac8299f71d57a929f8f30c5d1a8446e7)
- manual bump fix [`a362410`](https://github.com/oceanprotocol/ocean.js/commit/a36241004b1d9578ec5c02d9d6e64d9750c53a7b)

#### [v1.1.0](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0...v1.1.0)

> 15 June 2022
- Issue-#1485: Remove imports of ABIs in the tests and use utility tranfer(), mint(), balance() functions [`#1486`](https://github.com/oceanprotocol/ocean.js/pull/1486)
- Bump @types/node from 17.0.35 to 17.0.44 [`#1513`](https://github.com/oceanprotocol/ocean.js/pull/1513)
- Bump eslint-config-oceanprotocol from 1.5.0 to 2.0.1 [`#1466`](https://github.com/oceanprotocol/ocean.js/pull/1466)
- update to new schema & compute fixes [`#1510`](https://github.com/oceanprotocol/ocean.js/pull/1510)
- Release 1.1.2 [`85bf271`](https://github.com/oceanprotocol/ocean.js/commit/85bf2716e26d8691aeb9d5504e563d557419dc2e)
- manual bump fix [`5674a54`](https://github.com/oceanprotocol/ocean.js/commit/5674a547d1d367ce88b3595f0be8ebbf12274266)
- manual bump fix [`a362410`](https://github.com/oceanprotocol/ocean.js/commit/a36241004b1d9578ec5c02d9d6e64d9750c53a7b)
- Release 1.1.0 [`112c27e`](https://github.com/oceanprotocol/ocean.js/commit/112c27edab58ef0681ea3e87fb09978411924753)

#### [v1.0.0](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0-next.45...v1.0.0)

Expand Down
5 changes: 4 additions & 1 deletion ComputeExamples.md
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ let resolvedDatasetDdo: DDO
let resolvedAlgorithmDdo: DDO

let computeJobId: string
let agreementId: string
```
### 4.3 Helper methods
Expand Down Expand Up @@ -661,6 +662,8 @@ Let's have 5 minute of compute access
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

```

Expand All @@ -672,7 +675,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
)
```
<!--
Expand Down
9 changes: 5 additions & 4 deletions docs/classes/Provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -154,7 +154,7 @@ ___

### computeStop

**computeStop**(`did`, `consumerAddress`, `jobId`, `providerUri`, `signer`, `signal?`): `Promise`<[`ComputeJob`](../interfaces/ComputeJob.md) \| [`ComputeJob`](../interfaces/ComputeJob.md)[]\>
**computeStop**(`did`, `consumerAddress`, `jobId`, `providerUri`, `signer`, `signal?`, `agreementId?`): `Promise`<[`ComputeJob`](../interfaces/ComputeJob.md) \| [`ComputeJob`](../interfaces/ComputeJob.md)[]\>

Instruct the provider to Stop the execution of a to stop a compute job.

Expand All @@ -168,6 +168,7 @@ Instruct the provider to Stop the execution of a to stop a compute job.
| `providerUri` | `string` | The provider URI. |
| `signer` | `Signer` | The consumer signer object. |
| `signal?` | `AbortSignal` | abort signal |
| `agreementId?` | `string` | service agreement id |

#### Returns

Expand Down
57 changes: 29 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@oceanprotocol/lib",
"source": "./src/index.ts",
"version": "3.3.1",
"version": "3.3.3",
"description": "JavaScript client library for Ocean Protocol",
"main": "./dist/lib.js",
"umd:main": "dist/lib.umd.js",
Expand Down
10 changes: 10 additions & 0 deletions src/config/ConfigHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,16 @@ export const configHelperNetworks: Config[] = [
'https://v4.subgraph.sapphire-testnet.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
explorerUri: 'https://explorer.oasis.io/testnet/sapphire/',
gasFeeMultiplier: 1
},
{
...configHelperNetworksBase,
chainId: 32456,
network: 'pontus-x-devnet',
nodeUri: 'https://rpc.dev.pontus-x.eu',
metadataCacheUri: 'https://aquarius.dev.pontus-x.eu',
providerUri: 'https://provider.dev.pontus-x.eu',
subgraphUri: 'https://subgraph.dev.pontus-x.eu',
explorerUri: 'https://explorer.dev.pontus-x.eu/testnet/pontusx'
}
]

Expand Down
Loading

0 comments on commit a6620c9

Please sign in to comment.