Merge pull request #298 from nevermined-io/feat/sdk_1313

Adapt to SDK v1.3.13

Author: aaitor

.github/workflows/testing-nightly.yml

@@ -30,9 +30,9 @@ jobs:
           export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"
           rm -rf "${HOME}/.nevermined/nevermined-contracts/artifacts"
 
-          export KEEPER_VERSION=v3.0.0                                                        
+          export KEEPER_VERSION=v3.2.1                                                        
           export SUBGRAPH_VERSION=develop
-          export NODE_VERSION=v1.0.0
+          
           ./start_nevermined.sh --opengsn 2>&1 | tee nevermined_tools.txt &
           cd ../lib
           ./scripts/wait-nevermined.sh

.github/workflows/testing.yml

@@ -13,8 +13,8 @@ jobs:
   unit-test-with-build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: "16.x"
           registry-url: https://registry.npmjs.org/
@@ -34,13 +34,12 @@ jobs:
         with:
           node-version: "17.x"
           registry-url: https://registry.npmjs.org/
-      - uses: nevermined-io/nvm-tools-actions@v0.9.0
+      - uses: nevermined-io/nvm-tools-actions@v0.11.0
         with:
           token: ${{ secrets.API_TOKEN_GITHUB }}
           opengsn: 'true'
           estuary: 'true'
-          contracts-version: 'v3.0.0'
-          node-version: 'v1.0.0'
+          contracts-version: 'v3.2.1'
       - name: Install packages
         run: yarn install --ignore-engines
       - name: Check artifacts

CHANGELOG.md

@@ -53,12 +53,12 @@ export const runWorkflow = async () => {
 
     console.log(agreementId)
 
-    await sdk.nfts1155.transferForDelegate(
+    await sdk.nfts1155.claim(
       agreementId,
       publisher.getId(),
       consumer.getId(),
       BigNumber.from(1),
-      1155,
+      ddo.id
     )
 
     await sleep(2000)

catalog/integration-subgraph/utils.ts

@@ -1,11 +1,11 @@
 {
   "name": "@nevermined-io/catalog",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@nevermined-io/sdk": "^1.3.11",
-    "@nevermined-io/sdk-dtp": "^0.4.11",
+    "@nevermined-io/sdk": "^1.3.13",
+    "@nevermined-io/sdk-dtp": "^0.4.14",
     "@types/jsonwebtoken": "^8.5.8",
     "axios": "^0.27.2",
     "axios-retry": "^3.3.1",

catalog/package.json

@@ -392,7 +392,7 @@ export const NeverminedProvider = ({ children, config, verbose }: NeverminedProv
           newOwner,
           ercType,
         })
-        await new Promise((r) => setTimeout(r, 3000)) // await two seconds to allow the transaction to be processed
+        
         if (!agreementId) {
           Logger.log('Could not approve spending from new owner wallet. abort.')
           return false
@@ -684,7 +684,7 @@ export const NeverminedProvider = ({ children, config, verbose }: NeverminedProv
           }) as Account
 
           agreementId = await dtp.order(did, nftAmount, consumer, nftHolder)
-
+          
           transferResult = await dtp.transferForDelegate(did, agreementId, consumer, nftAmount, nftHolder)
         } else {
           agreementId = await executeWithProgressEvent(
@@ -700,12 +700,14 @@ export const NeverminedProvider = ({ children, config, verbose }: NeverminedProv
                 agreementId,
                 nftHolder,
                 buyer.getId(),
+                did
               )
             : await sdk.nfts1155.claim(
               agreementId,
               nftHolder,
               buyer.getId(),
               nftAmount,
+              did
             )
           }
       } catch (error) {

catalog/src/catalog.tsx

@@ -59,7 +59,7 @@ export const conductOrder = async ({
   ercType?: ERCType
 }): Promise<string> => {
   try {
-    Logger.log('Checking if USDC spending is approved.')
+    Logger.log('Checking if token spending is approved.')
     const isApproved = await sdk.keeper.nftUpgradeable.isApprovedForAll(
       newOwner.getId(),
       neverminedNodeAddress,
@@ -71,8 +71,8 @@ export const conductOrder = async ({
           : await sdk.nfts1155.setApprovalForAll(neverminedNodeAddress, true, newOwner)
       Logger.log('Approval receipt:', receipt)
     }
-    Logger.log('USDC spending is approved.')
-    Logger.log(`Asking for approval and locking payment for USDC.`)
+    Logger.log('Token spending is approved.')
+    Logger.log(`Asking for approval and locking payment.`)
     const agreementId: string =
       ercType === 721
         ? await sdk.nfts721.order(ddo.id, newOwner)

catalog/src/utils/index.ts

@@ -105,8 +105,8 @@
     ]
   },
   "dependencies": {
-    "@nevermined-io/sdk": "^1.3.10",
-    "@nevermined-io/sdk-dtp": "^0.4.10",
+    "@nevermined-io/sdk": "^1.3.13",
+    "@nevermined-io/sdk-dtp": "^0.4.14",
     "@types/jsonwebtoken": "^8.5.8",
     "@wagmi/core": "^0.8.15",
     "axios": "^0.27.2",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nevermined-io/providers",
   "private": false,
-  "version": "1.5.0",
+  "version": "1.6.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {

providers/package.json

@@ -2183,23 +2183,23 @@
     "@motionone/dom" "^10.15.5"
     tslib "^2.3.1"
 
-"@nevermined-io/sdk-dtp@^0.4.10":
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/@nevermined-io/sdk-dtp/-/sdk-dtp-0.4.11.tgz#755faadbba2201daae592af7610a34612d73dd95"
-  integrity sha512-khyS9GQD/ZZAg8sjbq/CH+EgGlm/YhzunY7Dwys9e08qnw/sZV3KwroEj7J7jV1X3ieYlNhIErUsVNWuOb2t5g==
+"@nevermined-io/sdk-dtp@^0.4.14":
+  version "0.4.14"
+  resolved "https://registry.yarnpkg.com/@nevermined-io/sdk-dtp/-/sdk-dtp-0.4.14.tgz#61d9ac9173a2dbd989cc02b790ef4e1503734b92"
+  integrity sha512-IP6mNDKeIDtXH7bnO8eNxUXFQagNc9hIhCX+OBCzG2Damws2s2dqcw/6W6xxt7je80gbIiFjT3hNwpbg7oawQw==
   dependencies:
-    "@nevermined-io/sdk" "1.3.11"
+    "@nevermined-io/sdk" "1.3.13"
     circomlibjs "^0.1.1"
     eciesjs "^0.3.15"
     ffjavascript "^0.2.55"
     node-rsa "^1.1.1"
     snarkjs "^0.4.26"
     web3-utils "^1.7.4"
 
-"@nevermined-io/sdk@1.3.11", "@nevermined-io/sdk@^1.3.10":
-  version "1.3.11"
-  resolved "https://registry.yarnpkg.com/@nevermined-io/sdk/-/sdk-1.3.11.tgz#5f0f63b3b6c0399163ff98b4074382aff438c210"
-  integrity sha512-L/FMGjRtnL5DoKdSq9i1I7J0lo5NBzpbp8iBH/xjmAjff6Gswq2JIZr1HBLQu1mw7Bb4D5/Hrm5dTgVPHEfomg==
+"@nevermined-io/sdk@1.3.13", "@nevermined-io/sdk@^1.3.13":
+  version "1.3.13"
+  resolved "https://registry.yarnpkg.com/@nevermined-io/sdk/-/sdk-1.3.13.tgz#66351ddd62dc7891c30d2c0cd00bd287673a1d01"
+  integrity sha512-yFLLI0fTlZ1SNW4VmfMuwU0+wedaCTtJuhVOUQsMTVTrRi0KS950tkbx+lceDH+klREdbWvXBSatOhu0Nhc7Kg==
   dependencies:
     "@nevermined-io/subgraphs" "0.5.1"
     assert "^2.0.0"