renaming

.github/workflows/test.yml

@@ -24,7 +24,10 @@ jobs:
         docker login -u ${{ secrets.NEVERMINED_DOCKER_USERNAME }} -p ${{ secrets.NEVERMINED_DOCKER_TOKEN}}
         sudo chmod go+r /etc/hosts
         sudo echo "127.0.0.1  nevermined-metadata" | sudo tee -a /etc/hosts
-        git clone https://github.com/nevermined-io/tools
+
+        # TODO: Use `master` when the renaming is done
+        git clone https://github.com/nevermined-io/tools -b feauture/node_name
+        
         cd tools
 
         export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"
@@ -77,7 +80,7 @@ jobs:
         yarn
         export NO_GRAPH=true
         export OLD_GATEWAY=false
-        export SEED_WORDS="taxi music thumb unique chat sand crew more leg another off lamp"
+        export SEED_WORDS=${{ secrets.seedWords }}
         ./scripts/wait-nevermined.sh
         yarn test
     - uses: actions/checkout@v3
@@ -91,6 +94,6 @@ jobs:
         yarn
         export NO_GRAPH=true
         export OLD_GATEWAY=false
-        export SEED_WORDS="taxi music thumb unique chat sand crew more leg another off lamp"
+        export SEED_WORDS=${{ secrets.seedWords }}
         ./scripts/wait-nevermined.sh
         yarn run integration

README.md

@@ -58,7 +58,7 @@ The Nevermined Node reads the following environment variables allowing the confi
 | Variable Name      | Description          | Example                |
 | ------------------ | -------------------- | ---------------------- |
 | **NETWORK_NAME**     | Network where the Node will be connected            | `mumbai`
-| **KEEPER_URL**     | HTTP url of the web3 provider. The most popular providers are Infura & Alchemy, but anyone else can be used. The url depends on the network you want to connect. | http://mumbai.alchemy.io/v2/xxxxx
+| **WEB3_PROVIDER_URL**     | HTTP url of the web3 provider. The most popular providers are Infura & Alchemy, but anyone else can be used. The url depends on the network you want to connect. | http://mumbai.alchemy.io/v2/xxxxx
 | **MARKETPLACE_API_URL**     | HTTP url to the Marketplace API                 | https://marketplace-api.mumbai.public.nevermined.rocks
 | **NODE_URL**     | Public HTTP url where this node is exposed                 | https://node.mumbai.public.nevermined.rocks
 | **PORT**     | Local Port the server will be listen to            | `8030`

config/nevermined.js

@@ -5,11 +5,11 @@ const fs = require('fs')
 const nograph = process.env['NO_GRAPH'] === 'true'
 
 const configBase = {
-    nodeUri: process.env['KEEPER_URL'] || 'http://localhost:8545',
+    web3ProviderUri: process.env['WEB3_PROVIDER_URL'] || 'http://localhost:8545',
     marketplaceUri: process.env['MARKETPLACE_URI'] || 'http://nevermined-metadata:3100',
     faucetUri: process.env['FAUCET_URI'] || 'http://localhost:3001',
-    gatewayUri: process.env['NODE_URI'] || 'http://localhost:8030',
-    gatewayAddress: process.env['NODE_ADDRESS'] || '0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0',
+    neverminedNodeUri: process.env['NODE_URI'] || 'http://localhost:8030',
+    neverminedNodeAddress: process.env['NODE_ADDRESS'] || '0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0',
     artifactsFolder: process.env['ARTIFACTS_FOLDER'] || './artifacts',
     marketplaceAuthToken: process.env['MARKETPLACE_AUTH_TOKEN'] || 'bogus',
     graphHttpUri: nograph

package.json

@@ -1,11 +1,12 @@
 {
   "name": "node-ts",
-  "version": "0.4.0",
+  "version": "0.4.0-rc0",
   "description": "Nevermined Node",
   "main": "main.ts",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
     "lint": "eslint ./",
+    "clean": "rm -rf ./dist/ ./doc/ ./.nyc_output",
     "lint:fix": "yarn run lint -- --fix",
     "setup:dev": "cp ./config/local.js.sample ./config/local.js && cp .env.sample .env",
     "prebuild": "rm -rf ./dist && mkdir ./dist && cp -r ./config ./dist/config && cp package.json ./dist",
@@ -24,8 +25,8 @@
     "@nestjs/platform-express": "^8.4.1",
     "@nestjs/swagger": "^5.2.0",
     "@nestjs/typeorm": "^8.0.3",
-    "@nevermined-io/nevermined-sdk-dtp": "0.1.0",
-    "@nevermined-io/nevermined-sdk-js": "0.25.0",
+    "@nevermined-io/nevermined-sdk-dtp": "0.2.0-rc0",
+    "@nevermined-io/nevermined-sdk-js": "0.26.0-rc0",
     "@sideway/address": "^4.1.3",
     "@sideway/formula": "^3.0.0",
     "@sideway/pinpoint": "^2.0.0",

src/info/info.controller.ts

@@ -60,7 +60,7 @@ export class InfoController {
       APIversion: packageJson.version,
       docs: `${pathEndpoint}api/v1/docs`,
       network: await nevermined.keeper.getNetworkName(),
-      'keeper-url': this.nvmService.nodeUri(),
+      'keeper-url': this.nvmService.web3ProviderUri(),
       'provenance-enabled': provenanceEnabled,
       'artifacts-folder': artifactDir,
       contracts: [],

src/shared/nevermined/nvm.service.ts

@@ -55,8 +55,8 @@ export class NeverminedService {
     };
     return instanceConfig;
   }
-  nodeUri(): string {
-    return this.config.nvm().nodeUri;
+  web3ProviderUri(): string {
+    return this.config.nvm().web3ProviderUri;
   }
 
   async getAssetUrl(did: string, index: number): Promise<{ url: string; content_type: string; dtp: boolean }> {

yarn.lock

@@ -1111,23 +1111,23 @@
   dependencies:
     uuid "8.3.2"
 
-"@nevermined-io/nevermined-sdk-dtp@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@nevermined-io/nevermined-sdk-dtp/-/nevermined-sdk-dtp-0.1.0.tgz#6c1ff74de384d792987fda93e7fc98f5348d5024"
-  integrity sha512-MkP0S8mVKvGS781q5q3HvzQUgLXiBfR+uIAa86B/M3YvJdxBBlagTPtXFitrheStXDhd1Hpl4BDSd/8L9+wVNQ==
+"@nevermined-io/nevermined-sdk-dtp@0.2.0-rc0":
+  version "0.2.0-rc0"
+  resolved "https://registry.yarnpkg.com/@nevermined-io/nevermined-sdk-dtp/-/nevermined-sdk-dtp-0.2.0-rc0.tgz#c4d73650ebadf0b86e8cd5fe536911255b68cc83"
+  integrity sha512-UHqUWnPP1tby5fjJdmLt7gDVdbhR+sOzadq5cszneD3JAaxrno3Xu8j751c1Tticlh5pwW+vCOsOJCibOdaI9Q==
   dependencies:
-    "@nevermined-io/nevermined-sdk-js" "0.25.0"
+    "@nevermined-io/nevermined-sdk-js" "0.26.0-rc0"
     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/nevermined-sdk-js@0.25.0":
-  version "0.25.0"
-  resolved "https://registry.yarnpkg.com/@nevermined-io/nevermined-sdk-js/-/nevermined-sdk-js-0.25.0.tgz#620a8b9287bc2dcc63360d1104cbf2f618d3add3"
-  integrity sha512-U3qgMBUoKgJgNQ8ZsitvJxmyF9bIkIY28ktXFUBinmDgDc4AsVpJmiVZfCFpeF5/S8iF4sKJ2gjQrqHC/ETCaA==
+"@nevermined-io/nevermined-sdk-js@0.26.0-rc0":
+  version "0.26.0-rc0"
+  resolved "https://registry.yarnpkg.com/@nevermined-io/nevermined-sdk-js/-/nevermined-sdk-js-0.26.0-rc0.tgz#15be185570ba98070c3c10a1a813dfa27c8eea6d"
+  integrity sha512-Z/QBPhBBD5SJIADLJBMU0E29QHgX8/XVDeCNN4S+2c2mudUE7fWsd9BD1Jge12C7XDTBCxFB3qqc4pHJcGfP1w==
   dependencies:
     "@nevermined-io/subgraphs" "0.4.1"
     assert "^2.0.0"