Merge branch 'develop' into feat/eslint-require-await

.github/workflows/release-github.yml

@@ -19,7 +19,7 @@ jobs:
       # Build process
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: 18
 
       - name: Set version to env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

.github/workflows/release-npm.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: 18
           registry-url: https://registry.npmjs.org/
       - run: yarn install --frozen-lockfile --ignore-engines
       - run: npm publish --access public

.github/workflows/testing-nightly.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Install dependencies
         run: |
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - uses: nevermined-io/[email protected]
         with:
           token: ${{ secrets.API_TOKEN_GITHUB }}
@@ -97,7 +97,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - uses: nevermined-io/[email protected]
         with:
           token: ${{ secrets.API_TOKEN_GITHUB }}
@@ -131,7 +131,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - uses: nevermined-io/[email protected]
         with:
           token: ${{ secrets.API_TOKEN_GITHUB }}
@@ -167,7 +167,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Install dependencies
         run: |

.github/workflows/testing-node.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - uses: actions/checkout@v3
         with:
           repository: nevermined-io/node

.github/workflows/testing.yml

@@ -12,13 +12,13 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - uses: nevermined-io/[email protected]
         with:
           token: ${{ secrets.API_TOKEN_GITHUB }}
           opengsn: 'true'
           estuary: 'true'
-          # TODO: Update to tagged versions when everything is relased and in main branches
+          # TODO: Update to tagged versions when everything is released and in main branches
           node-version: 'develop'
           contracts-version: 'latest'
 
@@ -48,6 +48,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Reclaim some disk space
+        run: docker system prune --all --volumes -f
       - uses: actions/checkout@v3
       - uses: actions/checkout@v3
         with:
@@ -57,7 +59,7 @@ jobs:
           token: ${{ secrets.API_TOKEN_GITHUB }}
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Deploy contracts
         run: |
@@ -79,7 +81,7 @@ jobs:
       - name: Start ganache
         env:
           SEED_WORDS: ${{ secrets.seedWords }}
-        run: yarn ganache --port 18545 --chain.chainId 8998 --wallet.mnemonic "$SEED_WORDS" --detach
+        run: yarn ganache --server.port 18545 --chain.chainId 8998 --wallet.mnemonic "$SEED_WORDS" --detach
 
       - name: Run unit tests
         env:

.gitignore

@@ -5,6 +5,7 @@ coverage/
 doc/
 test/**/*.js
 !test/resources/proxy-poc/*.js
+!test/resources/artifacts/*.json
 src/**/*.js
 package-lock.json
 yarn.lock

.nvmrc

@@ -1 +1 @@
-v12
+18

CHANGELOG.md

@@ -66,14 +66,49 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - feat: subscription by credits api [`f97aa61`](https://github.com/nevermined-io/sdk-js/commit/f97aa61c4328a7bc8ea1f14f584b3664876970db)
 - chore: adapting nft 1155 to duration and transfer params [`a133315`](https://github.com/nevermined-io/sdk-js/commit/a133315c8b217cec7d41e6f863277dfe94fce98a)
 
-#### [v2.0.0-rc2](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc1...v2.0.0-rc2)
+#### [v2.0.0-rc2](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc12...v2.0.0-rc2)
 
 > 26 July 2023
 
+#### [v2.0.0-rc12](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc11...v2.0.0-rc12)
+
+> 3 October 2023
+
+- fix: adaptations and tests for NVM App 1155 flows [`e97c3ac`](https://github.com/nevermined-io/sdk-js/commit/e97c3acfb5b80d22aca29328e92f2c9f66a153bd)
+- test: fix services e2e services flow [`f93664d`](https://github.com/nevermined-io/sdk-js/commit/f93664d07747e6e714f43d51ccf4d5184e3201fe)
+- chore: adding v2.0.0-rc11 Changelog updates [`222bec9`](https://github.com/nevermined-io/sdk-js/commit/222bec960167fa95caabcff30d29fef68623332a)
+
+#### [v2.0.0-rc11](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc10...v2.0.0-rc11)
+
+> 3 October 2023
+
+- fix: form-data lib was missing [`#588`](https://github.com/nevermined-io/sdk-js/pull/588)
+- fix: signTypedData [`#587`](https://github.com/nevermined-io/sdk-js/pull/587)
+- test: e2e testing of NVM App flows [`#585`](https://github.com/nevermined-io/sdk-js/pull/585)
+- chore: adding v2.0.0-rc10 Changelog updates [`467d492`](https://github.com/nevermined-io/sdk-js/commit/467d492cc04c58f0fdc1e8f51daecdb7e8babcae)
+
+#### [v2.0.0-rc10](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc1...v2.0.0-rc10)
+
+> 2 October 2023
+
+- updating for contracts 3.5.0 [`#584`](https://github.com/nevermined-io/sdk-js/pull/584)
+- Feat/node 18 [`#580`](https://github.com/nevermined-io/sdk-js/pull/580)
+- Getting url from DDO when claiming NFT [`#582`](https://github.com/nevermined-io/sdk-js/pull/582)
+- Fix/arbitrum fees [`#577`](https://github.com/nevermined-io/sdk-js/pull/577)
+- Making Curve & Aave contracts optional [`#576`](https://github.com/nevermined-io/sdk-js/pull/576)
+- Allowing to update files and services private stuff (SDKv1) [`#575`](https://github.com/nevermined-io/sdk-js/pull/575)
+- fix: allowing to update files and services private metadata [`#574`](https://github.com/nevermined-io/sdk-js/pull/574)
+- Allow off-chain register and resolve methods [`#573`](https://github.com/nevermined-io/sdk-js/pull/573)
+- chore(deps): bump whatwg-url from 7.1.0 to 13.0.0 [`#527`](https://github.com/nevermined-io/sdk-js/pull/527)
+- test: validating downloads by owner without access service [`#570`](https://github.com/nevermined-io/sdk-js/pull/570)
+- Adapting to contracts v3.3.x [`#566`](https://github.com/nevermined-io/sdk-js/pull/566)
+- E2E integration with Credit Subscriptions [`#563`](https://github.com/nevermined-io/sdk-js/pull/563)
+- Feat/update mocha [`#564`](https://github.com/nevermined-io/sdk-js/pull/564)
+- feat: reduce number of calls to chainId [`#560`](https://github.com/nevermined-io/sdk-js/pull/560)
 - Support of assets with multiple services of the same type [`#555`](https://github.com/nevermined-io/sdk-js/pull/555)
-- feat: make keeper network info static [`89511f1`](https://github.com/nevermined-io/sdk-js/commit/89511f11140398c146246a19438e958938b83376)
-- fix: bring back network info getters [`1ef0547`](https://github.com/nevermined-io/sdk-js/commit/1ef05470e53cbe91fcba5aa6e951bbd10b60decc)
-- chore: coming back to original attribute name [`941f96f`](https://github.com/nevermined-io/sdk-js/commit/941f96f485fee18398fe7e1517e8a43e85361754)
+- test: e2e tests for credit subscriptions [`5070f31`](https://github.com/nevermined-io/sdk-js/commit/5070f319baaa7fa361e103c6e1a4ffac2548012f)
+- fix: resolving integration problems [`87d7beb`](https://github.com/nevermined-io/sdk-js/commit/87d7beb3eb3897bcf7b5babb510d118f05d36c73)
+- test: e2e testing of NVM App flows [`886f0ae`](https://github.com/nevermined-io/sdk-js/commit/886f0ae27dab2dc6b1205f6b35c5861a5efaf9e2)
 
 #### [v2.0.0-rc1](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc0...v2.0.0-rc1)
 

integration/external/Datasets.e2e.test.ts

@@ -162,6 +162,7 @@ describe('Gate-keeping of Dataset using NFT ERC-721 End-to-End', () => {
         '',
         '',
         0,
+        nevermined.keeper.nvmConfig.address,
       ])
 
       await nevermined.contracts.loadNft721Api(subscriptionNFT)
@@ -334,7 +335,7 @@ describe('Gate-keeping of Dataset using NFT ERC-721 End-to-End', () => {
     })
 
     it('should be able to retrieve subscriptions purchased', async () => {
-      const result = await nevermined.search.subscriptionsPurchased(subscriber)
+      const result = await nevermined.search.subscriptionsPurchased(subscriber, 721)
       assert.isAbove(result.totalResults.value, 1)
 
       const dids = result.results.map((ddo) => ddo.id)
@@ -362,7 +363,7 @@ describe('Gate-keeping of Dataset using NFT ERC-721 End-to-End', () => {
     })
 
     it('should be able to retrieve subscriptions purchased filtering by tags', async () => {
-      const result = await nevermined.search.subscriptionsPurchased(subscriber, tagsFilter)
+      const result = await nevermined.search.subscriptionsPurchased(subscriber, 721, tagsFilter)
       assert.isAbove(result.totalResults.value, 1)
 
       assert.isTrue(
@@ -375,7 +376,7 @@ describe('Gate-keeping of Dataset using NFT ERC-721 End-to-End', () => {
     })
 
     it('should not be able to retrieve not subscriptions purchased filtering by tags which do not exist', async () => {
-      const result = await nevermined.search.subscriptionsPurchased(subscriber, tagsFilter2)
+      const result = await nevermined.search.subscriptionsPurchased(subscriber, 721, tagsFilter2)
       assert.equal(result.totalResults.value, 0)
     })