Merge pull request #1278 from OriginTrail/release/testnet

OriginTrail Mainnet Prerelease v4.1.3
OriginTrail · Jun 9, 2020 · 05f1638 · 05f1638
2 parents 8b1364c + 7e41e23
commit 05f1638
Show file tree

Hide file tree

Showing 25 changed files with 330 additions and 142 deletions.
diff --git a/config/config.json b/config/config.json
@@ -41,6 +41,7 @@
       "provider": "arangodb",
       "username": "root",
       "password": "root",
+      "password_file_name": "arango.txt",
       "port": 8529,
       "database": "origintrail-develop",
       "host": "localhost",
@@ -152,6 +153,7 @@
       "provider": "arangodb",
       "username": "root",
       "password": "root",
+      "password_file_name": "arango.txt",
       "port": 8529,
       "database": "origintrail",
       "host": "localhost",
@@ -222,7 +224,7 @@
     "dc_choose_time": 300000,
     "requireApproval": false,
     "litigationEnabled": true,
-    "commandExecutorVerboseLoggingEnabled": true,
+    "commandExecutorVerboseLoggingEnabled": false,
     "reputationWindowInMinutes": 129600
   },
   "mainnet": {
@@ -267,6 +269,7 @@
       "provider": "arangodb",
       "username": "root",
       "password": "root",
+      "password_file_name": "arango.txt",
       "port": 8529,
       "database": "origintrail",
       "host": "localhost",

diff --git a/modules/ImportUtilities.js b/modules/ImportUtilities.js
@@ -673,7 +673,7 @@ class ImportUtilities {
      * Fill in dataset header
      * @private
      */
-    static createDatasetHeader(config, transpilationInfo = null, datasetTags = [], datasetTitle = '', datasetDescription = '', OTJSONVersion = '1.0') {
+    static createDatasetHeader(config, transpilationInfo = null, datasetTags = [], datasetTitle = '', datasetDescription = '', OTJSONVersion = '1.1') {
         const header = {
             OTJSONVersion,
             datasetCreationTimestamp: new Date().toISOString(),

diff --git a/modules/OtJsonUtilities.js b/modules/OtJsonUtilities.js
@@ -36,7 +36,7 @@ class OtJsonUtilities {
     static _getDatasetVersion(dataset) {
         if (!dataset || !dataset.datasetHeader ||
             !dataset.datasetHeader.OTJSONVersion) {
-            return '1.0';
+            return '1.1';
             // throw new Error('Could not determine dataset ot-json version!');
         }
         return dataset.datasetHeader.OTJSONVersion;

diff --git a/modules/command/dh/dh-offer-finalized-command.js b/modules/command/dh/dh-offer-finalized-command.js
@@ -53,7 +53,7 @@ class DhOfferFinalizedCommand extends Command {
                     await bid.save({ fields: ['status'] });
                     this.logger.important(`I've been chosen for offer ${offerId}.`);
 
-                    await this.remoteControl.onCompletedBids();
+                    // await this.remoteControl.onCompletedBids();
 
                     if (this.config.disableAutoPayouts !== true) {
                         const scheduledTime =
@@ -79,7 +79,7 @@ class DhOfferFinalizedCommand extends Command {
                 bid.status = 'NOT_CHOSEN';
                 await bid.save({ fields: ['status'] });
                 this.logger.important(`I haven't been chosen for offer ${offerId}.`);
-                await this.remoteControl.onCompletedBids();
+                // await this.remoteControl.onCompletedBids();
                 return Command.empty();
             }
         }
@@ -97,7 +97,7 @@ class DhOfferFinalizedCommand extends Command {
         const bid = await Models.bids.findOne({ where: { offer_id: offerId } });
         bid.status = 'NOT_CHOSEN';
         await bid.save({ fields: ['status'] });
-        await this.remoteControl.onCompletedBids();
+        // await this.remoteControl.onCompletedBids();
         return Command.empty();
     }
 

diff --git a/modules/controller/info-controller.js b/modules/controller/info-controller.js
@@ -0,0 +1,50 @@
+const pjson = require('../../package.json');
+
+class InfoController {
+    constructor(ctx) {
+        this.logger = ctx.logger;
+        this.transport = ctx.transport;
+        this.config = ctx.config;
+        this.graphStorage = ctx.graphStorage;
+    }
+
+    async getNodeInfo(req, res) {
+        this.logger.api('GET: Node information request received.');
+
+        try {
+            const network = await this.transport.getNetworkInfo();
+
+            const basicConfig = {
+                version: pjson.version,
+                blockchain: this.config.blockchain.blockchain_title,
+                network,
+                is_bootstrap: this.config.is_bootstrap_node,
+            };
+
+            if (!this.config.is_bootstrap_node) {
+                const numberOfVertices = await this.graphStorage.getDocumentsCount('ot_vertices');
+                const numberOfEdges = await this.graphStorage.getDocumentsCount('ot_edges');
+                Object.assign(basicConfig, {
+                    node_wallet: this.config.node_wallet,
+                    erc_725_identity: this.config.erc725Identity,
+                    graph_size: {
+                        number_of_vertices: numberOfVertices,
+                        number_of_edges: numberOfEdges,
+                    },
+                });
+            }
+
+            res.status(200);
+            res.send(basicConfig);
+        } catch (error) {
+            this.logger.error(`Failed to process /api/info route. ${error}`);
+            res.status(500);
+            res.send({
+                message: error,
+            });
+        }
+    }
+}
+
+module.exports = InfoController;
+
diff --git a/modules/migration/m5-arango-password-migration.js b/modules/migration/m5-arango-password-migration.js
@@ -0,0 +1,36 @@
+const Utilities = require('../Utilities');
+const { execSync } = require('child_process');
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Changes the arango password to a randomly generated one
+ */
+class M5ArangoPasswordMigration {
+    constructor({
+        config, log,
+    }) {
+        this.config = config;
+        this.log = log;
+    }
+
+    /**
+     * Run migration
+     */
+    async run() {
+        try {
+            execSync('cp ./scripts/update-arango-password.sh ./');
+            execSync('chmod +x update-arango-password.sh');
+            execSync(`./update-arango-password.sh ${this.config.appDataPath} ${this.config.database.host} ${this.config.database.port}`, { stdio: 'inherit' });
+            execSync('rm ./update-arango-password.sh');
+            return 0;
+        } catch (error) {
+            this.log.error('Arango password update migration failed!');
+            this.log.error(error);
+            return -1;
+        }
+    }
+}
+
+module.exports = M5ArangoPasswordMigration;
diff --git a/modules/network/kademlia/kademlia.js b/modules/network/kademlia/kademlia.js
@@ -405,17 +405,14 @@ class Kademlia {
                         if (err) {
                             reject(Error(`Failed to find contact ${contactId}. ${err}`));
                         }
-                        if (result && Array.isArray(result)) {
-                            const contact = result[0];
-                            if (contact && Array.isArray(contact) && contact.length === 2
+                        const contact = this._getContactFromInterativeFindNodeResult(result);
+                        if (contact && Array.isArray(contact) && contact.length === 2
                                 && contact[1].hostname && contact[1].port
                                 && contact[0] === contact[1].identity) {
-                                this.log.debug(`Found proxy contact in routing table. ${contact[0]} - ${contact[1].hostname}:${contact[1].port}`);
-                                accept({ contact, header });
-                            }
-                            reject(Error(`Unknown contact ${contactId}.`));
+                            this.log.debug(`Found proxy contact in routing table. ${contact[0]} - ${contact[1].hostname}:${contact[1].port}`);
+                            accept({ contact, header });
                         }
-                        reject(Error(`Failed to find contact ${contactId}. Not array: ${result}`));
+                        reject(Error(`Unknown contact ${contactId}.`));
                     });
                 });
             };
@@ -845,6 +842,15 @@ class Kademlia {
             proof,
         }));
     }
+
+    _getContactFromInterativeFindNodeResult(result) {
+        for (const contact of result) {
+            if (contact[0] !== this.config.identity) {
+                return contact;
+            }
+        }
+        return null;
+    }
 }
 
 module.exports = Kademlia;
diff --git a/modules/network/transport.js b/modules/network/transport.js
@@ -149,7 +149,7 @@ class Transport {
                     halt(err);
                     return;
                 }
-                this.logger.debug(`Calling ${fn} operation failed at ${iteration} iteration. Contact ${contactId}, ${err}.\n${err.stack}`);
+                this.logger.debug(`Calling ${fn} operation failed at ${iteration} iteration. Contact ${contactId}, ${err}.}`);
                 throw err;
             }
         }, opts);

diff --git a/modules/service/dh-service.js b/modules/service/dh-service.js
@@ -170,7 +170,7 @@ class DHService {
             transactional: false,
         });
 
-        await this.remoteControl.getPendingBids();
+        // await this.remoteControl.getPendingBids();
     }
 
     /**

diff --git a/modules/service/rest-api-controller.js b/modules/service/rest-api-controller.js
@@ -15,7 +15,7 @@ class RestApiController {
         this.logger = ctx.logger;
         this.apiUtilities = ctx.apiUtilities;
         this.emitter = ctx.emitter;
-
+        this.infoController = ctx.infoController;
         this.version_id = 'controller';
 
         this.restApis = [new RestApiV2(ctx, true)];
@@ -140,7 +140,9 @@ class RestApiController {
     }
 
     _exposeBootstrapAPIRoutes(server) {
-        this._registerNodeInfoRoute(server, true);
+        server.get('/api/info', async (req, res) => {
+            await this.infoController.getNodeInfo(req, res);
+        });
     }
 
     _exposeAPIRoutes(server) {
@@ -157,49 +159,6 @@ class RestApiController {
             });
         });
     }
-
-    /**
-     * Register common info route
-     * @param server - Server instance
-     * @param isBootstrap - Is this a bootstrap node?
-     * @private
-     */
-    _registerNodeInfoRoute(server, isBootstrap) {
-        const {
-            transport,
-            config,
-        } = this.ctx;
-
-        server.get('/api/info', async (req, res) => {
-            this.logger.api('GET: Node information request received.');
-
-            try {
-                const network = await transport.getNetworkInfo();
-                const basicConfig = {
-                    version: pjson.version,
-                    blockchain: config.blockchain.blockchain_title,
-                    network,
-                    is_bootstrap: isBootstrap,
-                };
-
-                if (!isBootstrap) {
-                    Object.assign(basicConfig, {
-                        node_wallet: config.node_wallet,
-                        erc_725_identity: config.erc725Identity,
-                    });
-                }
-
-                res.status(200);
-                res.send(basicConfig);
-            } catch (error) {
-                this.logger.error(`Failed to process /api/info route. ${error}`);
-                res.status(500);
-                res.send({
-                    message: error,
-                });
-            }
-        });
-    }
 }
 
 module.exports = RestApiController;
diff --git a/modules/service/rest-api-v2.js b/modules/service/rest-api-v2.js
@@ -22,6 +22,7 @@ class RestAPIServiceV2 {
         this.dcController = ctx.dcController;
         this.dhController = ctx.dhController;
         this.dvController = ctx.dvController;
+        this.infoController = ctx.infoController;
 
         this.exportController = ctx.exportController;
         this.remoteControl = ctx.remoteControl;
@@ -53,14 +54,10 @@ class RestAPIServiceV2 {
             transport, emitter, blockchain, web3, config,
         } = this.ctx;
 
-        this._registerNodeInfoRoute(server, false);
+        server.get(`/api/${this.version_id}/info`, async (req, res) => {
+            await this.infoController.getNodeInfo(req, res);
+        });
 
-        /**
-         * Data import route
-         * @param file - file or text data
-         * @param standard_id - ID of file standard
-         *        (supported standards are listed in this.standards array)
-         */
         server.post(`/api/${this.version_id}/import`, async (req, res) => {
             await this._importDataset(req, res);
         });
@@ -390,49 +387,6 @@ class RestAPIServiceV2 {
         });
     }
 
-    /**
-     * Register common info route
-     * @param server - Server instance
-     * @param isBootstrap - Is this a bootstrap node?
-     * @private
-     */
-    _registerNodeInfoRoute(server, isBootstrap) {
-        const {
-            transport,
-            config,
-        } = this.ctx;
-
-        server.get(`/api/${this.version_id}/info`, async (req, res) => {
-            this.logger.api('GET: Node information request received.');
-
-            try {
-                const network = await transport.getNetworkInfo();
-                const basicConfig = {
-                    version: pjson.version,
-                    blockchain: config.blockchain.blockchain_title,
-                    network,
-                    is_bootstrap: isBootstrap,
-                };
-
-                if (!isBootstrap) {
-                    Object.assign(basicConfig, {
-                        node_wallet: config.node_wallet,
-                        erc_725_identity: config.erc725Identity,
-                    });
-                }
-
-                res.status(200);
-                res.send(basicConfig);
-            } catch (error) {
-                this.logger.error(`Failed to process /api/info route. ${error}`);
-                res.status(500);
-                res.send({
-                    message: error,
-                });
-            }
-        });
-    }
-
     async _getTrail(req, res) {
         this.logger.api('POST: Trail request received.');
 

diff --git a/modules/transpiler/epcis/epcis-otjson-transpiler.js b/modules/transpiler/epcis/epcis-otjson-transpiler.js
@@ -1166,7 +1166,7 @@ class EpcisOtJsonTranspiler {
         return {
             transpilationInfo: {
                 transpilerType: 'GS1-EPCIS',
-                transpilerVersion: '1.0',
+                transpilerVersion: '1.1',
                 sourceMetadata: {
                     created: created.toISOString(),
                     modified: created.toISOString(),