Reverted merge

OriginTrail · Apr 1, 2022 · bb351b2 · bb351b2
1 parent cf79cbd
commit bb351b2
Show file tree

Hide file tree

Showing 33 changed files with 11,764 additions and 2,954 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/ISSUE_TEMPLATE/bug_report_v6.md b/.github/ISSUE_TEMPLATE/bug_report_v6.md
diff --git a/.github/release-drafter-template.yml b/.github/release-drafter-template.yml
diff --git a/.github/workflows/TEST-release.yml b/.github/workflows/TEST-release.yml
diff --git a/.github/workflows/TEST-unit.yml b/.github/workflows/TEST-unit.yml
diff --git a/.github/workflows/release-drafter-config.yml b/.github/workflows/release-drafter-config.yml
diff --git a/config/config.json b/config/config.json
@@ -24,7 +24,7 @@
       "password": ""
     },
     "logLevel": "trace",
-    "replicationFactor": 5,
+    "replicationFactor" : 5,
     "rpcPort": 8900,
     "network": {
       "port": 9000,
@@ -36,59 +36,8 @@
     ],
     "telemetryHub": {
       "enabled": false,
-      "packages": [
-        "ot-telemetry-collector"
-      ],
+      "packages": ["ot-telemetry-collector"],
       "url": ""
-    },
-    "operationalDatabase": {
-      "databaseName": "operationaldb"
-    }
-  },
-  "test": {
-    "appDataPath": "data",
-    "autoUpdate": {
-      "enabled": false,
-      "branch": "v6/develop",
-      "backupDirectory": "../backup"
-    },
-    "blockchain": [
-      {
-        "blockchainTitle": "ganache",
-        "networkId": "ganache::testnet",
-        "hubContractAddress": "",
-        "rpcEndpoints": [
-          "http://localhost:7545"
-        ]
-      }
-    ],
-    "graphDatabase": {
-      "implementation": "GraphDB",
-      "url": "http://localhost:7200",
-      "name": "node0",
-      "username": "admin",
-      "password": ""
-    },
-    "logLevel": "trace",
-    "replicationFactor": 5,
-    "rpcPort": 8900,
-    "network": {
-      "port": 9000,
-      "bootstrap": []
-    },
-    "ipWhitelist": [
-      "::1",
-      "127.0.0.1"
-    ],
-    "telemetryHub": {
-      "enabled": false,
-      "packages": [
-        "ot-telemetry-collector"
-      ],
-      "url": ""
-    },
-    "operationalDatabase": {
-      "databaseName": "operationaldb"
     }
   },
   "testnet": {
@@ -116,7 +65,7 @@
       "password": ""
     },
     "logLevel": "trace",
-    "replicationFactor": 5,
+    "replicationFactor" : 5,
     "rpcPort": 8900,
     "network": {
       "port": 9000,
@@ -132,13 +81,8 @@
     ],
     "telemetryHub": {
       "enabled": true,
-      "packages": [
-        "ot-telemetry-collector"
-      ],
+      "packages": ["ot-telemetry-collector"],
       "url": "https://polaris.delta.origin-trail.network/metrics/"
-    },
-    "operationalDatabase": {
-      "databaseName": "operationaldb"
     }
   },
   "mainnet": {
@@ -157,7 +101,7 @@
       "password": ""
     },
     "logLevel": "trace",
-    "replicationFactor": 5,
+    "replicationFactor" : 5,
     "rpcPort": 8900,
     "network": {
       "port": 9000,
@@ -169,13 +113,8 @@
     ],
     "telemetryHub": {
       "enabled": false,
-      "packages": [
-        "ot-telemetry-collector"
-      ],
+      "packages": ["ot-telemetry-collector"],
       "url": ""
-    },
-    "operationalDatabase": {
-      "databaseName": "operationaldb"
     }
   }
 }
diff --git a/config/sequelizeConfig.js b/config/sequelizeConfig.js
@@ -3,6 +3,7 @@ require('dotenv').config();
 module.exports = {
     username: 'root',
     password: '',
+    database: 'operationaldb',
     dialect: 'mysql',
     host: 'localhost',
     port: 3306,

diff --git a/external/libp2p-service.js b/external/libp2p-service.js
@@ -55,18 +55,18 @@ class Libp2pService {
                 listen: [`/ip4/0.0.0.0/tcp/${this.config.port}`] // for production
                 // announce: ['/dns4/auto-relay.libp2p.io/tcp/443/wss/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3']
             };
-            let id;
-            let privKey;
+
             if (!this.config.peerId) {
-                if (!this.config.privateKey) {
-                    id = await PeerId.create({bits: 1024, keyType: 'RSA'})
-                    privKey = id.toJSON().privKey;
-                } else {
-                    privKey = this.config.privateKey;
-                    id = await PeerId.createFromPrivKey(this.config.privateKey);
+                const configFile = JSON.parse(fs.readFileSync(this.config.configFilename));
+                if (!configFile.network.privateKey) {
+                    const id = await PeerId.create({bits: 1024, keyType: 'RSA'})
+                    configFile.network.privateKey = id.toJSON().privKey;
+                    if(process.env.NODE_ENV !== 'development') {
+                        fs.writeFileSync(this.config.configFilename, JSON.stringify(configFile, null, 2));
+                    }
                 }
-                this.config.privateKey = privKey;
-                this.config.peerId = id;
+                this.config.privateKey = configFile.network.privateKey;
+                this.config.peerId = await PeerId.createFromPrivKey(this.config.privateKey);
             }
 
             initializationObject.peerId = this.config.peerId;
@@ -83,10 +83,7 @@ class Libp2pService {
                     const peerId = this.node.peerId._idB58String;
                     this.config.id = peerId;
                     this.logger.info(`Network ID is ${peerId}, connection port is ${port}`);
-                    resolve({
-                        peerId: id,
-                        privateKey: privKey,
-                    });
+                    resolve(result);
                 })
                 .catch((err) => {
                     reject(err);
@@ -291,7 +288,7 @@ class Libp2pService {
               constants.NETWORK_API_BLACK_LIST_TIME_WINDOW_MINUTES -
                 (Date.now() - this.blackList[remotePeerId]) / (1000 * 60)
             );
-
+            
             if(remainingMinutes > 0) {
                 this.logger.info(`Blocking request from ${remotePeerId}. Node is blacklisted for ${remainingMinutes} minutes.`);
 
@@ -300,7 +297,7 @@ class Libp2pService {
                 delete this.blackList[remotePeerId]
             }
         }
-
+        
         if(await this.rateLimiter.spamDetection.limit(remotePeerId)) {
             this.blackList[remotePeerId] = Date.now();
             this.logger.info(
@@ -312,8 +309,8 @@ class Libp2pService {
             this.logger.info(`Blocking request from ${remotePeerId}. Max number of requests exceeded.`);
 
             return true;
-        }
-
+        } 
+            
         return false;
     }
 

diff --git a/index.js b/index.js
@@ -18,13 +18,7 @@ config = rc(pjson.name, defaultConfig);
 
 (async () => {
     try {
-        let userConfig = null;
-        if (process.env.NODE_ENV === 'development' && process.argv.length === 3) {
-            const configurationFilename = process.argv[2];
-            userConfig = JSON.parse(fs.readFileSync(process.argv[2]));
-            userConfig.configFilename = configurationFilename;
-        }
-        const node = new OTNode(userConfig);
+        const node = new OTNode();
         await node.start();
     } catch (e) {
         console.error(`Error occurred while starting new version, error message: ${e}. ${e.stack}`);