Merge pull request #1285 from OriginTrail/prerelease/mainnet

Update OT-JSON sort method
OriginTrail · Jun 17, 2020 · 2a6f6fd · 2a6f6fd
2 parents 91c8113 + 57cb387
commit 2a6f6fd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/modules/ImportUtilities.js b/modules/ImportUtilities.js
@@ -664,6 +664,7 @@ class ImportUtilities {
         if (!sortedDataset) {
             sortedDataset = Utilities.copyObject(dataset);
         }
+        ImportUtilities.removeGraphPermissionedData(sortedDataset['@graph']);
         delete sortedDataset.signature;
         return web3.eth.accounts.recover(JSON.stringify(sortedDataset), dataset.signature.value);
     }

diff --git a/modules/OtJsonUtilities.js b/modules/OtJsonUtilities.js
@@ -42,6 +42,16 @@ class OtJsonUtilities {
         return dataset.datasetHeader.OTJSONVersion;
     }
 
+    static _repackDataset(dataset) {
+        return {
+            '@id': dataset['@id'],
+            '@type': dataset['@type'],
+            datasetHeader: dataset.datasetHeader,
+            '@graph': JSON.parse(Utilities.sortObjectRecursively(dataset['@graph'])),
+            signature: dataset.signature,
+        };
+    }
+
     /**
      * Formats the dataset graph hash so that the graph hash can be calculated properly for that
      * OT-JSON version
@@ -111,7 +121,10 @@ class OtJsonUtilities {
             return datasetCopy;
         case '1.1':
             datasetCopy = Utilities.copyObject(dataset);
-            return JSON.parse(Utilities.sortObjectRecursively(datasetCopy));
+            if (datasetCopy.datasetHeader.transpilationInfo) {
+                return JSON.parse(Utilities.sortObjectRecursively(datasetCopy));
+            }
+            return this._repackDataset(datasetCopy);
         default:
             throw new Error('Unsupported ot-json version!');
         }
@@ -300,7 +313,10 @@ class OtJsonUtilities {
             return undefined;
         case '1.1':
             datasetCopy = Utilities.copyObject(dataset);
-            return JSON.parse(Utilities.sortObjectRecursively(datasetCopy));
+            if (datasetCopy.datasetHeader.transpilationInfo) {
+                return JSON.parse(Utilities.sortObjectRecursively(datasetCopy));
+            }
+            return this._repackDataset(datasetCopy);
         default:
             throw new Error('Unsupported ot-json version!');
         }
@@ -323,7 +339,10 @@ class OtJsonUtilities {
             return undefined;
         case '1.1':
             datasetCopy = Utilities.copyObject(dataset);
-            return JSON.parse(Utilities.sortObjectRecursively(datasetCopy));
+            if (datasetCopy.datasetHeader.transpilationInfo) {
+                return JSON.parse(Utilities.sortObjectRecursively(datasetCopy));
+            }
+            return this._repackDataset(datasetCopy);
         default:
             throw new Error('Unsupported ot-json version!');
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "origintrail_node",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "description": "OriginTrail node",
   "main": ".eslintrc.js",
   "config": {