v1.3.24 (#523)

* Version 1.3.24
OriginTrail · Sep 3, 2018 · 6c650d2 · 6c650d2
1 parent d88b398
commit 6c650d2
Show file tree

Hide file tree

Showing 55 changed files with 2,132 additions and 1,400 deletions.
diff --git a/.env.example b/.env.example
@@ -43,4 +43,4 @@ SEND_LOGS=1
 LOGS_LEVEL_DEBUG=1
 
 # Network identification
-NETWORK_ID=TestnetV1.0.1b
+NETWORK_ID=TestnetV1.0.2b
diff --git a/importers/xml_examples/Retail/03_Pink_to_Orange_shipment.xml b/importers/xml_examples/Retail/03_Pink_to_Orange_shipment.xml
@@ -40,7 +40,7 @@
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Orange">
 								<attribute id="urn:ot:object:actor:name">Green</attribute>
 								<attribute id="urn:ot:object:actor:category">Company Retail</attribute>
-								<attribute id="urn:ot:object:actor:wallet">0xCcAB7BD40602B78C0649032D2532dEFa23A4C0</attribute>
+								<attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
 							</VocabularyElement>
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Pink">
 								<attribute id="urn:ot:object:actor:name">Pink</attribute>
@@ -136,4 +136,4 @@
 			</ObjectEvent>
 		</EventList>
 	</EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/importers/xml_examples/Retail/04_Pink_to_Orange_receipt.xml b/importers/xml_examples/Retail/04_Pink_to_Orange_receipt.xml
@@ -40,7 +40,7 @@
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Orange">
 								<attribute id="urn:ot:object:actor:name">Green</attribute>
 								<attribute id="urn:ot:object:actor:category">Company Retail</attribute>
-								<attribute id="urn:ot:object:actor:wallet">0xCcAB7BD40602B78C0649032D2532dEFa23A4C0</attribute>
+								<attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
 							</VocabularyElement>	
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Pink">
 								<attribute id="urn:ot:object:actor:name">Pink</attribute>
@@ -135,4 +135,4 @@
 			</ObjectEvent>
 		</EventList>
 	</EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/importers/xml_examples/Retail/05_Pink_to_Red_shipment.xml b/importers/xml_examples/Retail/05_Pink_to_Red_shipment.xml
@@ -38,9 +38,9 @@
 					<Vocabulary type="urn:ot:object:actor">
 						<VocabularyElementList>
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Red">
-								<attribute id="urn:ot:object:actor:name">Green</attribute>
+								<attribute id="urn:ot:object:actor:name">Red</attribute>
 								<attribute id="urn:ot:object:actor:category">Company Retail</attribute>
-								<attribute id="urn:ot:object:actor:wallet">0xCcAB7BD40602B78C0649032D2532dEFa23A4C0</attribute>
+								<attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
 							</VocabularyElement>	
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Pink">
 								<attribute id="urn:ot:object:actor:name">Pink</attribute>
@@ -136,4 +136,4 @@
 			</ObjectEvent>
 		</EventList>
 	</EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/importers/xml_examples/Retail/06_Pink_to_Red_receipt.xml b/importers/xml_examples/Retail/06_Pink_to_Red_receipt.xml
@@ -40,7 +40,7 @@
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Red">
 								<attribute id="urn:ot:object:actor:name">Red</attribute>
 								<attribute id="urn:ot:object:actor:category">Company Retail</attribute>
-								<attribute id="urn:ot:object:actor:wallet">0xCcAB7BD40602B78C0649032D2532dEFa23A4C0</attribute>
+								<attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
 							</VocabularyElement>	
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Pink">
 								<attribute id="urn:ot:object:actor:name">Pink</attribute>

diff --git a/importers/xml_examples/Retail_with_Zk/04_Pink_to_Orange_shipment.xml b/importers/xml_examples/Retail_with_Zk/04_Pink_to_Orange_shipment.xml
@@ -38,9 +38,9 @@
 					<Vocabulary type="urn:ot:object:actor">
 						<VocabularyElementList>
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Orange">
-								<attribute id="urn:ot:object:actor:name">Green</attribute>
+								<attribute id="urn:ot:object:actor:name">Orange</attribute>
 								<attribute id="urn:ot:object:actor:category">Company Retail</attribute>
-								<attribute id="urn:ot:object:actor:wallet">0xCcAB7BD40602B78C0649032D2532dEFa23A4C0</attribute>
+								<attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
 							</VocabularyElement>
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Pink">
 								<attribute id="urn:ot:object:actor:name">Pink</attribute>
@@ -136,4 +136,4 @@
 			</ObjectEvent>
 		</EventList>
 	</EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/importers/xml_examples/Retail_with_Zk/05_Pink_to_Orange_receipt.xml b/importers/xml_examples/Retail_with_Zk/05_Pink_to_Orange_receipt.xml
@@ -38,9 +38,9 @@
 					<Vocabulary type="urn:ot:object:actor">
 						<VocabularyElementList>
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Orange">
-								<attribute id="urn:ot:object:actor:name">Green</attribute>
+								<attribute id="urn:ot:object:actor:name">Orange</attribute>
 								<attribute id="urn:ot:object:actor:category">Company Retail</attribute>
-								<attribute id="urn:ot:object:actor:wallet">0xCcAB7BD40602B78C0649032D2532dEFa23A4C0</attribute>
+								<attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
 							</VocabularyElement>	
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Pink">
 								<attribute id="urn:ot:object:actor:name">Pink</attribute>

diff --git a/importers/xml_examples/Retail_with_Zk/06_Pink_to_Red_shipment.xml b/importers/xml_examples/Retail_with_Zk/06_Pink_to_Red_shipment.xml
@@ -38,9 +38,9 @@
 					<Vocabulary type="urn:ot:object:actor">
 						<VocabularyElementList>
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Red">
-								<attribute id="urn:ot:object:actor:name">Green</attribute>
+								<attribute id="urn:ot:object:actor:name">Red</attribute>
 								<attribute id="urn:ot:object:actor:category">Company Retail</attribute>
-								<attribute id="urn:ot:object:actor:wallet">0xCcAB7BD40602B78C0649032D2532dEFa23A4C0</attribute>
+								<attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
 							</VocabularyElement>	
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Pink">
 								<attribute id="urn:ot:object:actor:name">Pink</attribute>
@@ -136,4 +136,4 @@
 			</ObjectEvent>
 		</EventList>
 	</EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/importers/xml_examples/Retail_with_Zk/07_Pink_to_Red_receipt.xml b/importers/xml_examples/Retail_with_Zk/07_Pink_to_Red_receipt.xml
@@ -38,9 +38,9 @@
 					<Vocabulary type="urn:ot:object:actor">
 						<VocabularyElementList>
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Red">
-								<attribute id="urn:ot:object:actor:name">Green</attribute>
+								<attribute id="urn:ot:object:actor:name">Red</attribute>
 								<attribute id="urn:ot:object:actor:category">Company Retail</attribute>
-								<attribute id="urn:ot:object:actor:wallet">0xCcAB7BD40602B78C0649032D2532dEFa23A4C0</attribute>
+								<attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
 							</VocabularyElement>	
 							<VocabularyElement id="urn:ot:object:actor:id:Company_Pink">
 								<attribute id="urn:ot:object:actor:name">Pink</attribute>
@@ -135,4 +135,4 @@
 			</ObjectEvent>
 		</EventList>
 	</EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/importers/xml_examples/Retail_with_aggregation/01_Green_packing.xml b/importers/xml_examples/Retail_with_aggregation/01_Green_packing.xml
@@ -36,15 +36,10 @@
                                 <attribute id="urn:ot:object:actor:wallet">0xAaBbAd7BD40602B78C0649032D2532dEFa23A4C0</attribute>
                             </VocabularyElement>
                             <VocabularyElement id="urn:ot:object:actor:id:Company_Pink">
-                                <attribute id="urn:ot:object:actor:name">Green</attribute>
+                                <attribute id="urn:ot:object:actor:name">Pink</attribute>
                                 <attribute id="urn:ot:object:actor:category">Company producer</attribute>
                                 <attribute id="urn:ot:object:actor:wallet">0xBbAaAd7BD40602B78C0649032D2532dEFa24323</attribute>
                             </VocabularyElement>
-                            <VocabularyElement id="urn:ot:object:actor:id:Company_Orange">
-                                <attribute id="urn:ot:object:actor:name">Green</attribute>
-                                <attribute id="urn:ot:object:actor:category">Company producer</attribute>
-                                <attribute id="urn:ot:object:actor:wallet">0xCcCcAd7BD40602B78C0649032D2532dEFa212345</attribute>
-                            </VocabularyElement>
                         </VocabularyElementList>
                     </Vocabulary>
 
@@ -59,27 +54,6 @@
                                     <id>urn:epc:id:sgln:Building_Green_V2</id>
                                 </children>
                             </VocabularyElement>
-
-                            <VocabularyElement id="urn:epc:id:sgln:Building_Pink">
-                                <attribute id="urn:ot:object:location:category">Building</attribute>
-                                <attribute id="urn:ot:object:location:description">Distributor</attribute>
-                                <attribute id="urn:ot:object:location:actorId">urn:ot:object:actor:id:Company_Pink</attribute>
-                                <children>
-                                    <id>urn:epc:id:sgln:Building_Pink_V3</id>
-                                    <id>urn:epc:id:sgln:Building_Pink_V4</id>
-                                </children>
-                            </VocabularyElement>
-
-                            <VocabularyElement id="urn:epc:id:sgln:Building_Orange">
-                                <attribute id="urn:ot:object:location:category">Building</attribute>
-                                <attribute id="urn:ot:object:location:description">Retail store</attribute>
-                                <attribute id="urn:ot:object:location:actorId">urn:ot:object:actor:id:Company_Orange</attribute>
-                                <children>
-                                    <id>urn:epc:id:sgln:Building_Orange_V5</id>
-                                    <id>urn:epc:id:sgln:Building_Orange_V6</id>
-                                </children>
-                            </VocabularyElement>
-
                         </VocabularyElementList>
                     </Vocabulary>
 
@@ -173,4 +147,4 @@
             </AggregationEvent>
         </EventList>
     </EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/importers/xml_examples/Retail_with_aggregation/02_Green_to_pink_shipment.xml b/importers/xml_examples/Retail_with_aggregation/02_Green_to_pink_shipment.xml
@@ -36,15 +36,10 @@
                                 <attribute id="urn:ot:object:actor:wallet">0xAaBbAd7BD40602B78C0649032D2532dEFa23A4C0</attribute>
                             </VocabularyElement>
                             <VocabularyElement id="urn:ot:object:actor:id:Company_Pink">
-                                <attribute id="urn:ot:object:actor:name">Green</attribute>
+                                <attribute id="urn:ot:object:actor:name">Pink</attribute>
                                 <attribute id="urn:ot:object:actor:category">Company producer</attribute>
                                 <attribute id="urn:ot:object:actor:wallet">0xBbAaAd7BD40602B78C0649032D2532dEFa24323</attribute>
                             </VocabularyElement>
-                            <VocabularyElement id="urn:ot:object:actor:id:Company_Orange">
-                                <attribute id="urn:ot:object:actor:name">Green</attribute>
-                                <attribute id="urn:ot:object:actor:category">Company producer</attribute>
-                                <attribute id="urn:ot:object:actor:wallet">0xCcCcAd7BD40602B78C0649032D2532dEFa212345</attribute>
-                            </VocabularyElement>
                         </VocabularyElementList>
                     </Vocabulary>
 

diff --git a/importers/xml_examples/Retail_with_aggregation/03_Green_to_pink_receipt.xml b/importers/xml_examples/Retail_with_aggregation/03_Green_to_pink_receipt.xml
@@ -36,15 +36,10 @@
                                 <attribute id="urn:ot:object:actor:wallet">0xAaBbAd7BD40602B78C0649032D2532dEFa23A4C0</attribute>
                             </VocabularyElement>
                             <VocabularyElement id="urn:ot:object:actor:id:Company_Pink">
-                                <attribute id="urn:ot:object:actor:name">Green</attribute>
+                                <attribute id="urn:ot:object:actor:name">Pink</attribute>
                                 <attribute id="urn:ot:object:actor:category">Company producer</attribute>
                                 <attribute id="urn:ot:object:actor:wallet">0xBbAaAd7BD40602B78C0649032D2532dEFa24323</attribute>
                             </VocabularyElement>
-                            <VocabularyElement id="urn:ot:object:actor:id:Company_Orange">
-                                <attribute id="urn:ot:object:actor:name">Green</attribute>
-                                <attribute id="urn:ot:object:actor:category">Company producer</attribute>
-                                <attribute id="urn:ot:object:actor:wallet">0xCcCcAd7BD40602B78C0649032D2532dEFa212345</attribute>
-                            </VocabularyElement>
                         </VocabularyElementList>
                     </Vocabulary>
 
@@ -164,4 +159,4 @@
             </ObjectEvent> 
         </EventList>
     </EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/importers/xml_examples/Retail_with_aggregation/04_Pink_to_orange_shipment.xml b/importers/xml_examples/Retail_with_aggregation/04_Pink_to_orange_shipment.xml
@@ -41,9 +41,9 @@
                                 <attribute id="urn:ot:object:actor:wallet">0xBbAaAd7BD40602B78C0649032D2532dEFa24323</attribute>
                             </VocabularyElement>
                             <VocabularyElement id="urn:ot:object:actor:id:Company_Orange">
-                                <attribute id="urn:ot:object:actor:name">Green</attribute>
+                                <attribute id="urn:ot:object:actor:name">Orange</attribute>
                                 <attribute id="urn:ot:object:actor:category">Company producer</attribute>
-                                <attribute id="urn:ot:object:actor:wallet">0xCcCcAd7BD40602B78C0649032D2532dEFa212345</attribute>
+                                <attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
                             </VocabularyElement>
                         </VocabularyElementList>
                     </Vocabulary>
@@ -164,4 +164,4 @@
             </ObjectEvent>
         </EventList>
     </EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/importers/xml_examples/Retail_with_aggregation/05_Pink_to_orange_receipt.xml b/importers/xml_examples/Retail_with_aggregation/05_Pink_to_orange_receipt.xml
@@ -41,9 +41,9 @@
                                 <attribute id="urn:ot:object:actor:wallet">0xBbAaAd7BD40602B78C0649032D2532dEFa24323</attribute>
                             </VocabularyElement>
                             <VocabularyElement id="urn:ot:object:actor:id:Company_Orange">
-                                <attribute id="urn:ot:object:actor:name">Green</attribute>
+                                <attribute id="urn:ot:object:actor:name">Orange</attribute>
                                 <attribute id="urn:ot:object:actor:category">Company producer</attribute>
-                                <attribute id="urn:ot:object:actor:wallet">0xCcCcAd7BD40602B78C0649032D2532dEFa212345</attribute>
+                                <attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
                             </VocabularyElement>
                         </VocabularyElementList>
                     </Vocabulary>
@@ -164,4 +164,4 @@
             </ObjectEvent>
         </EventList>
     </EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/importers/xml_examples/Retail_with_aggregation/06_Orange_unpacking.xml b/importers/xml_examples/Retail_with_aggregation/06_Orange_unpacking.xml
@@ -41,9 +41,9 @@
                                 <attribute id="urn:ot:object:actor:wallet">0xBbAaAd7BD40602B78C0649032D2532dEFa24323</attribute>
                             </VocabularyElement>
                             <VocabularyElement id="urn:ot:object:actor:id:Company_Orange">
-                                <attribute id="urn:ot:object:actor:name">Green</attribute>
+                                <attribute id="urn:ot:object:actor:name">Orange</attribute>
                                 <attribute id="urn:ot:object:actor:category">Company producer</attribute>
-                                <attribute id="urn:ot:object:actor:wallet">0xCcCcAd7BD40602B78C0649032D2532dEFa212345</attribute>
+                                <attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
                             </VocabularyElement>
                         </VocabularyElementList>
                     </Vocabulary>
@@ -151,4 +151,4 @@
             </AggregationEvent>
         </EventList>
     </EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/importers/xml_examples/Retail_with_aggregation/07_Orange_unpacking_all.xml b/importers/xml_examples/Retail_with_aggregation/07_Orange_unpacking_all.xml
@@ -41,9 +41,9 @@
                                 <attribute id="urn:ot:object:actor:wallet">0xBbAaAd7BD40602B78C0649032D2532dEFa24323</attribute>
                             </VocabularyElement>
                             <VocabularyElement id="urn:ot:object:actor:id:Company_Orange">
-                                <attribute id="urn:ot:object:actor:name">Green</attribute>
+                                <attribute id="urn:ot:object:actor:name">Orange</attribute>
                                 <attribute id="urn:ot:object:actor:category">Company producer</attribute>
-                                <attribute id="urn:ot:object:actor:wallet">0xCcCcAd7BD40602B78C0649032D2532dEFa212345</attribute>
+                                <attribute id="urn:ot:object:actor:wallet">0x90398eF02389Ef85F262737b4B3aDB8eE588B43A</attribute>
                             </VocabularyElement>
                         </VocabularyElementList>
                     </Vocabulary>
@@ -149,4 +149,4 @@
             </AggregationEvent>
         </EventList>
     </EPCISBody>
-</epcis:EPCISDocument>
+</epcis:EPCISDocument>
diff --git a/migrations/20180407120531-create-data-info.js b/migrations/20180407120531-create-data-info.js
@@ -23,6 +23,10 @@ module.exports = {
             allowNull: false,
             type: Sequelize.STRING,
         },
+        import_hash: {
+            allowNull: false,
+            type: Sequelize.STRING,
+        },
         import_timestamp: {
             allowNull: false,
             type: Sequelize.DATE,
@@ -31,6 +35,10 @@ module.exports = {
             allowNull: false,
             type: Sequelize.INTEGER,
         },
+        transaction_hash: {
+            allowNull: true,
+            type: Sequelize.STRING,
+        },
     }),
     down: (queryInterface, Sequelize) => queryInterface.dropTable('data_infos'),
 };
diff --git a/models/data_info.js b/models/data_info.js
@@ -5,8 +5,10 @@ module.exports = (sequelize, DataTypes) => {
         data_provider_wallet: DataTypes.STRING(42),
         total_documents: DataTypes.INTEGER,
         root_hash: DataTypes.STRING(40),
+        import_hash: DataTypes.STRING(40),
         import_timestamp: DataTypes.DATE,
         data_size: DataTypes.INTEGER,
+        transaction_hash: DataTypes.STRING(128),
     }, {
         tableName: 'data_info',
     });

diff --git a/modules/Blockchain.js b/modules/Blockchain.js
@@ -35,10 +35,11 @@ class Blockchain {
      * Writes data import root hash on blockchain
      * @param importId
      * @param rootHash
+     * @param importHash
      * @returns {Promise}
      */
-    writeRootHash(importId, rootHash) {
-        return this.blockchain.writeRootHash(importId, rootHash);
+    writeRootHash(importId, rootHash, importHash) {
+        return this.blockchain.writeRootHash(importId, rootHash, importHash);
     }
 
     /**

diff --git a/modules/Blockchain/Ethereum/Transactions.js b/modules/Blockchain/Ethereum/Transactions.js
@@ -34,10 +34,11 @@ class Transactions {
                             break;
                         }
                     } catch (error) {
-                        this.log.trace(`Nonce too low / underpriced detected. Retrying. ${error.toString()}`);
                         if (!error.toString().includes('nonce too low') && !error.toString().includes('underpriced')) {
                             throw new Error(error);
                         }
+
+                        this.log.trace(`Nonce too low / underpriced detected. Retrying. ${error.toString()}`);
                         // eslint-disable-next-line no-await-in-loop
                         await sleep.sleep(2000);
                     }