Merge pull request #1732 from OriginTrail/v6/prerelease/testnet

OriginTrail 6.0.0-beta.1.22 Testnet Release

config/config.json

@@ -22,6 +22,7 @@
       "password": ""
     },
     "logLevel": "trace",
+    "replicationFactor" : 3,
     "rpcPort": 8900,
     "network": {
       "port": 9000,
@@ -60,6 +61,7 @@
       "password": ""
     },
     "logLevel": "trace",
+    "replicationFactor" : 3,
     "rpcPort": 8900,
     "network": {
       "port": 9000,
@@ -93,6 +95,7 @@
       "password": ""
     },
     "logLevel": "trace",
+    "replicationFactor" : 3,
     "rpcPort": 8900,
     "network": {
       "port": 9000,

modules/controller/rpc-controller.js

@@ -142,7 +142,15 @@ class RpcController {
         this.app.post('/publish', async (req, res, next) => {
             if (!req.files || !req.files.file || !req.body.assets) {
                 return next({code: 400, message: 'File, assets, and keywords are required fields.'});
+            } else {
+                if(!this.isArrayOfStrings(req.body.assets)){
+                    return next({code: 400, message: `Assets must be a non-empty array of strings, all strings must have double quotes.`});
+                }
+                if(req.body.keywords && !this.isArrayOfStrings(req.body.keywords)) {
+                    return next({code: 400, message: `Keywords must be a non-empty array of strings, all strings must have double quotes.`});
+                }
             }
+
             const operationId = uuidv1();
             try {
                 this.logger.emit({
@@ -769,6 +777,18 @@ class RpcController {
             }
         });
     }
+
+    isArrayOfStrings(arr) {
+        try {
+            const bodyAssets = JSON.parse(arr.toLowerCase());
+            if (!(Array.isArray(bodyAssets)) | !(bodyAssets.length > 0) | !bodyAssets.every(i => (typeof i === "string")) | bodyAssets[0] === "") {
+                return false;
+            }
+        } catch (e) {
+            return false;
+        }
+        return true;
+    }
 }
 
 module.exports = RpcController;

modules/service/publish-service.js

@@ -22,7 +22,6 @@ class PublishService {
         assertion.id = this.validationService.calculateHash(assertion.metadataHash + assertion.metadata.dataHash);
         assertion.signature = this.validationService.sign(assertion.id);
 
-        keywords.push(assertion.metadata.type);
         keywords = [...new Set(keywords.concat(rawAssets))];
 
         const assets = [];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "origintrail_node",
-  "version": "6.0.0-beta.1.21",
+  "version": "6.0.0-beta.1.22",
   "description": "OTNode v6 Beta 1",
   "main": "index.js",
   "scripts": {
@@ -76,7 +76,7 @@
     "mysql2": "^2.3.3",
     "n3": "^1.12.2",
     "nodemon": "^2.0.15",
-    "ot-telemetry-collector": "^1.0.1",
+    "ot-telemetry-collector": "^1.0.2",
     "p-iteration": "^1.1.8",
     "peer-id": "^0.15.3",
     "pino": "^7.5.1",