Merge pull request #2429 from OriginTrail/v6/prerelease/mainnet

Mainnet 6.0.4 Release
OriginTrail · Apr 13, 2023 · c742a39 · c742a39
2 parents ae64a0d + 0ee8055
commit c742a39
Show file tree

Hide file tree

Showing 139 changed files with 16,172 additions and 16,230 deletions.
diff --git a/.github/workflows/TEST-bdd.yml b/.github/workflows/TEST-bdd.yml
@@ -23,10 +23,10 @@ jobs:
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-      graphdb:
-        image: khaller/graphdb-free:1.3.5-graphdb9.11.2
+      blazegraph:
+        image: lyrasis/blazegraph:2.1.5
         ports:
-          - 7200:7200
+          - 9999:9999
     strategy:
       matrix:
         node-version: [16.x]
@@ -41,6 +41,7 @@ jobs:
       - run: sudo chmod -R 777 $ARTIFACTS_DIR
       - run: mkdir -p $CUCUMBER_ARTIFACTS_DIR
       - run: sudo chmod -R 777 $CUCUMBER_ARTIFACTS_DIR
+      - run: npm explore dkg-evm-module -- npm run compile;
       - run: npm run test:bdd;
       - uses: actions/upload-artifact@v2
         if: ${{ always() }}

diff --git a/config/config.json b/config/config.json
@@ -112,14 +112,14 @@
             "blockchain": {
                 "enabled": true,
                 "implementation": {
-                    "ganache": {
+                    "hardhat": {
                         "enabled": true,
-                        "package": "./blockchain/implementation/ganache/ganache-service.js",
+                        "package": "./blockchain/implementation/hardhat/hardhat-service.js",
                         "config": {
-                            "blockchainTitle": "ganache",
+                            "blockchainTitle": "hardhat",
                             "networkId": "ganache::testnet",
-                            "hubContractAddress": "0x209679fA3B658Cd0fC74473aF28243bfe78a9b12",
-                            "rpcEndpoints": ["http://localhost:7545"],
+                            "hubContractAddress": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
+                            "rpcEndpoints": ["http://localhost:8545"],
                             "evmManagementPublicKey": "0x1B420da5f7Be66567526E32bc68ab29F1A63765A",
                             "initialStakeAmount": 50000,
                             "initialAskAmount": 0.2
@@ -277,14 +277,14 @@
             "blockchain": {
                 "enabled": true,
                 "implementation": {
-                    "ganache": {
+                    "hardhat": {
                         "enabled": true,
-                        "package": "./blockchain/implementation/ganache/ganache-service.js",
+                        "package": "./blockchain/implementation/hardhat/hardhat-service.js",
                         "config": {
                             "blockchainTitle": "ganache",
                             "networkId": "ganache::testnet",
-                            "hubContractAddress": "0x209679fA3B658Cd0fC74473aF28243bfe78a9b12",
-                            "rpcEndpoints": ["http://localhost:7545"],
+                            "hubContractAddress": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
+                            "rpcEndpoints": ["http://localhost:8545"],
                             "initialStakeAmount": 50000,
                             "initialAskAmount": 0.2
                         }
@@ -294,9 +294,9 @@
             "tripleStore": {
                 "enabled": true,
                 "implementation": {
-                    "ot-graphdb": {
+                    "ot-blazegraph": {
                         "enabled": true,
-                        "package": "./triple-store/implementation/ot-graphdb/ot-graphdb.js",
+                        "package": "./triple-store/implementation/ot-blazegraph/ot-blazegraph.js",
                         "config": {}
                     }
                 }
@@ -411,6 +411,7 @@
                             "hubContractAddress": "0xBbfF7Ea6b2Addc1f38A0798329e12C08f03750A6",
                             "rpcEndpoints": [
                                 "https://lofar-testnet.origin-trail.network",
+                                "https://lofar-testnet.origintrail.network",
                                 "wss://parachain-testnet-rpc.origin-trail.network"
                             ]
                         }

diff --git a/dependencies.md b/dependencies.md
@@ -57,10 +57,10 @@
 -   **version**: ^8.5.0
 -   **description**: linter plugin
 
-##### [ganache](https://www.npmjs.com/package/ganache)
+##### [ethers](https://www.npmjs.com/package/ethers)
 
--   **version**: ^7.4.1
--   **description**: ethereum simulator used in bdd tests
+-   **version**: ^5.7.2
+-   **description**: used to interact with evm smart contracts
 
 ##### [husky](https://www.npmjs.com/package/husky)
 
@@ -389,11 +389,6 @@
 -   **version**: ^8.3.2
 -   **description**: uuid generation
 
-##### [web3](https://www.npmjs.com/package/web3)
-
--   **version**: ^1.7.5
--   **description**: used to interact with evm smart contracts
-
 ##### [workerpool](https://www.npmjs.com/package/workerpool)
 
 -   **version**: ^6.2.1

diff --git a/index.js b/index.js
@@ -6,16 +6,17 @@ import appRootPath from 'app-root-path';
 import { execSync } from 'child_process';
 import semver from 'semver';
 import OTNode from './ot-node.js';
+import { NODE_ENVIRONMENTS } from './src/constants/constants.js';
 
 process.env.NODE_ENV =
-    process.env.NODE_ENV && ['development', 'testnet', 'mainnet'].indexOf(process.env.NODE_ENV) >= 0
+    process.env.NODE_ENV && Object.values(NODE_ENVIRONMENTS).includes(process.env.NODE_ENV)
         ? process.env.NODE_ENV
-        : 'development';
+        : NODE_ENVIRONMENTS.DEVELOPMENT;
 
 (async () => {
     let userConfig = null;
     try {
-        if (process.env.NODE_ENV === 'development' && process.argv.length === 3) {
+        if (process.env.NODE_ENV === NODE_ENVIRONMENTS.DEVELOPMENT && process.argv.length === 3) {
             const configurationFilename = process.argv[2];
             userConfig = JSON.parse(await fs.promises.readFile(process.argv[2]));
             userConfig.configFilename = configurationFilename;
@@ -30,7 +31,7 @@ process.env.NODE_ENV =
     } catch (e) {
         console.error(`Error occurred while start ot-node, error message: ${e}. ${e.stack}`);
         console.error(`Trying to recover from older version`);
-        if (process.env.NODE_ENV !== 'development') {
+        if (process.env.NODE_ENV !== NODE_ENVIRONMENTS.DEVELOPMENT) {
             const rootPath = path.join(appRootPath.path, '..');
             const oldVersionsDirs = (await fs.promises.readdir(rootPath, { withFileTypes: true }))
                 .filter((dirent) => dirent.isDirectory())

diff --git a/installer/data/template/.origintrail_noderc_one_click_testnet.json b/installer/data/template/.origintrail_noderc_one_click_testnet.json
@@ -0,0 +1,55 @@
+{
+  "modules": {
+    "blockchain": {
+      "defaultImplementation": "otp",
+      "implementation": {
+        "otp": {
+          "config": {
+            "sharesTokenSymbol": "<SHARES_TOKEN_SYMBOL>",
+            "sharesTokenName": "<SHARES_TOKEN_NAME>",
+            "evmOperationalWalletPublicKey": "<EVM_OPERATIONAL_WALLET>",
+            "evmOperationalWalletPrivateKey": "<EVM_OPERATIONAL_WALLET_PRIVATE_KEY>",
+            "evmManagementWalletPrivateKey": "<EVM_MANAGEMENT_WALLET_PRIVATE_KEY>",
+            "evmManagementWalletPublicKey": "<EVM_MANAGEMENT_WALLET>"
+          }
+        }
+      }
+    },
+    "tripleStore": {
+      "implementation": {
+        "ot-blazegraph": {
+          "enabled": true,
+          "package": "./triple-store/implementation/ot-blazegraph/ot-blazegraph.js",
+          "config": {
+            "repositories": {
+              "privateCurrent": {
+                "url": "http://localhost:9999",
+                "name": "private-current",
+                "username": "admin",
+                "password": ""
+              },
+              "privateHistory": {
+                "url": "http://localhost:9999",
+                "name": "private-history",
+                "username": "admin",
+                "password": ""
+              },
+              "publicCurrent": {
+                "url": "http://localhost:9999",
+                "name": "public-current",
+                "username": "admin",
+                "password": ""
+              },
+              "publicHistory": {
+                "url": "http://localhost:9999",
+                "name": "public-history",
+                "username": "admin",
+                "password": ""
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}