Merge pull request #1242 from OriginTrail/prerelease/testnet

OriginTrail Testnet Release v4.1.0
OriginTrail · Apr 21, 2020 · 45ad305 · 45ad305
2 parents 52f3867 + 53c1db1
commit 45ad305
Show file tree

Hide file tree

Showing 98 changed files with 8,053 additions and 1,391 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Expected behavior
+
+## Actual behavior
+
+## Steps to reproduce the problem
+
+  1.
+  2.
+  3.
+
+## Specifications
+
+  - Node version:
+  - Platform:
+  - Node wallet:
+  - ERC725 identity:
+
+## Contact details
+  - Email:
+
+## Error logs
+
+
+## Disclaimer
+
+Please be aware that the issue reported on a public repository allows everyone to see your node logs, node details, and contact details. If you have any sensitive information, feel free to share it by sending an email to [tech@origin-trail.com](tech@origin-trail.com).
diff --git a/config/config.json b/config/config.json
@@ -35,6 +35,7 @@
     "dh_min_stake_amount": "100000000000",
     "dh_min_reputation": -50,
     "latest_api_version" : "v2.0",
+    "default_data_price": "100000000000000000000",
     "send_challenges_log" : true,
     "database": {
       "provider": "arangodb",
@@ -145,6 +146,7 @@
     "dh_min_stake_amount": "100000000000",
     "dh_min_reputation": -50,
     "latest_api_version" : "v2.0",
+    "default_data_price": "100000000000000000000",
     "send_challenges_log" : true,
     "database": {
       "provider": "arangodb",
@@ -259,6 +261,7 @@
     "dh_min_stake_amount": "100000000000",
     "dh_min_reputation": -50,
     "latest_api_version" : "v2.0",
+    "default_data_price": "100000000000000000000",
     "send_challenges_log" : true,
     "database": {
       "provider": "arangodb",

diff --git a/importers/sample_files/DC1_02-sample_product_shipping.xml b/importers/sample_files/DC1_02-sample_product_shipping.xml
@@ -21,7 +21,7 @@
                     <id>urn:epc:id:sgln:0000000.22222.0</id>
                 </bizLocation>
                 <bizTransactionList>
-                    <bizTransaction>sampleFarmAtDate12102019:0x475092045ff115c5eea7679d7edae8c97a64967c</bizTransaction>
+                    <bizTransaction>sampleFarmAtDate12102019:0x9353a6c07787170a43c4eb23f59567811336a8f3</bizTransaction>
                 </bizTransactionList>
 
             </ObjectEvent>

diff --git a/importers/sample_files/DC2_01-sample_product_receiving.xml b/importers/sample_files/DC2_01-sample_product_receiving.xml
@@ -21,7 +21,7 @@
                     <id>urn:epc:id:sgln:0000000.33333.0</id>
                 </bizLocation>
                 <bizTransactionList>
-                    <bizTransaction>sampleFarmAtDate12102019:0xfc41a6e359ee40996fe08f2d2e8728d2bc204442</bizTransaction>
+                    <bizTransaction>sampleFarmAtDate12102019:0x0dfa2ecdde11abb744e85aa7d7b57ee1b10548a4</bizTransaction>
                 </bizTransactionList>
 
             </ObjectEvent>

diff --git a/importers/sample_files/DC2_03-sample_batch_shipping.xml b/importers/sample_files/DC2_03-sample_batch_shipping.xml
@@ -22,7 +22,7 @@
                     <id>urn:epc:id:sgln:0000000.55555.0</id>
                 </bizLocation>
                 <bizTransactionList>
-                    <bizTransaction>sampleFarmAtDate14102019:0x75bd15b2f5a5f2ead02717973e1fdf1d4c8f914a</bizTransaction>
+                    <bizTransaction>sampleFarmAtDate14102019:0xa452e4a445a2fd8a1aa5371122a7251286fd5dc4</bizTransaction>
                 </bizTransactionList>
             </ObjectEvent>
         </EventList>

diff --git a/importers/sample_files/DC3_01-sample_batch_receiving.xml b/importers/sample_files/DC3_01-sample_batch_receiving.xml
@@ -21,7 +21,7 @@
                     <id>urn:epc:id:sgln:0000000.66666.0</id>
                 </bizLocation>
                 <bizTransactionList>
-                    <bizTransaction>sampleFarmAtDate14102019:0x475092045ff115c5eea7679d7edae8c97a64967c</bizTransaction>
+                    <bizTransaction>sampleFarmAtDate14102019:0x9353a6c07787170a43c4eb23f59567811336a8f3</bizTransaction>
                 </bizTransactionList>
             </ObjectEvent>
         </EventList>

diff --git a/importers/use_cases/connectors/01_Green_to_pink_shipment.xml b/importers/use_cases/connectors/01_Green_to_pink_shipment.xml
@@ -115,7 +115,7 @@
 			</bizLocation>
 			<bizTransactionList>
 				<bizTransaction>
-					connectionId:0xfc41a6e359ee40996fe08f2d2e8728d2bc204442
+					connectionId:0x0dfa2ecdde11abb744e85aa7d7b57ee1b10548a4
 				</bizTransaction>
 			</bizTransactionList>
 			<extension>

diff --git a/importers/use_cases/connectors/02_Green_to_Pink_receipt.xml b/importers/use_cases/connectors/02_Green_to_Pink_receipt.xml
@@ -115,12 +115,12 @@
 				</bizLocation>
 				<bizTransactionList>
 					<bizTransaction>
-						connectionId:0xfc41a6e359ee40996fe08f2d2e8728d2bc204442
+						connectionId:0x0dfa2ecdde11abb744e85aa7d7b57ee1b10548a4
 					</bizTransaction>
 				</bizTransactionList>
 				<extension>
 					<quantityList>
-						<quantityElement>			 
+						<quantityElement>
 							<epcClass>urn:epc:id:sgtin:Batch_1</epcClass>
 							<quantity>10</quantity>
 							<uom>KG</uom>