Merge pull request #971 from OriginTrail/prerelease/mariner

Release v2.0.59
OriginTrail · Oct 1, 2019 · a03b29b · a03b29b
2 parents 7840080 + fed04a1
commit a03b29b
Show file tree

Hide file tree

Showing 24 changed files with 460 additions and 103 deletions.
diff --git a/config/config.json b/config/config.json
@@ -55,6 +55,7 @@
       "network_id": "rinkeby",
       "gas_limit": "2000000",
       "gas_price": "20000000000",
+      "max_allowed_gas_price" : "50000000000",
       "hub_contract_address": "0x056f4DA796C00766061158A01cE068D912be9c89",
       "plugins": [
         {
@@ -91,7 +92,7 @@
     "dc_holding_time_in_minutes": 60,
     "dc_token_amount_per_holder": "50000000000000000000",
     "dc_litigation_interval_in_minutes": 5,
-    "dh_max_holding_time_in_minutes": 10080,
+    "dh_max_holding_time_in_minutes": 2635200,
     "dh_min_token_price": "10000000000000000000",
     "dh_min_litigation_interval_in_minutes": 5,
     "deposit_on_demand": true,
@@ -155,6 +156,7 @@
       "network_id": "rinkeby",
       "gas_limit": "2000000",
       "gas_price": "20000000000",
+      "max_allowed_gas_price" : "50000000000",
       "hub_contract_address": "0x16d553B9765b6Aa9fE7C45Dfa1a1839fD88DD7bc",
       "plugins": [
         {
@@ -191,7 +193,7 @@
     "dc_holding_time_in_minutes": 60,
     "dc_token_amount_per_holder": "1",
     "dc_litigation_interval_in_minutes": 5,
-    "dh_max_holding_time_in_minutes": 1440,
+    "dh_max_holding_time_in_minutes": 2635200,
     "dh_min_token_price": "1",
     "dh_min_litigation_interval_in_minutes": 5,
     "deposit_on_demand": false,
@@ -255,6 +257,7 @@
       "network_id": "rinkeby",
       "gas_limit": "2000000",
       "gas_price": "20000000000",
+      "max_allowed_gas_price" : "50000000000",
       "hub_contract_address": "0x6C314872A7e97A6F1dC7De2dc43D28500dd36f22",
       "plugins": [
         {
@@ -291,7 +294,7 @@
     "dc_holding_time_in_minutes": 60,
     "dc_token_amount_per_holder": "50000000000000000000",
     "dc_litigation_interval_in_minutes": 5,
-    "dh_max_holding_time_in_minutes": 10080,
+    "dh_max_holding_time_in_minutes": 2635200,
     "dh_min_token_price": "10000000000000000000",
     "dh_min_litigation_interval_in_minutes": 5,
     "deposit_on_demand": false,
@@ -355,6 +358,7 @@
       "network_id": "rinkeby",
       "gas_limit": "2000000",
       "gas_price": "20000000000",
+      "max_allowed_gas_price" : "50000000000",
       "hub_contract_address": "0x0e5995FE34BfC9DB7a31fa318f7f1256Cf28FfCa",
       "plugins": [
         {
@@ -394,7 +398,7 @@
     "dc_holding_time_in_minutes": 60,
     "dc_token_amount_per_holder": "50000000000000000000",
     "dc_litigation_interval_in_minutes": 5,
-    "dh_max_holding_time_in_minutes": 10080,
+    "dh_max_holding_time_in_minutes": 2635200,
     "dh_min_token_price": "10000000000000000000",
     "dh_min_litigation_interval_in_minutes": 5,
     "deposit_on_demand": false,
@@ -458,6 +462,7 @@
       "network_id": "mainnet",
       "gas_limit": "2000000",
       "gas_price": "20000000000",
+      "max_allowed_gas_price" : "50000000000",
       "hub_contract_address": "0xa287d7134fb40bef071c932286bd2cd01efccf30",
       "plugins": [
         {
@@ -497,7 +502,7 @@
     "dc_holding_time_in_minutes": 10080,
     "dc_token_amount_per_holder": "50000000000000000000",
     "dc_litigation_interval_in_minutes": 5,
-    "dh_max_holding_time_in_minutes": 10080,
+    "dh_max_holding_time_in_minutes": 2635200,
     "dh_min_token_price": "20000000000000000000",
     "dh_min_litigation_interval_in_minutes": 5,
     "deposit_on_demand": false,

diff --git a/migrations/201909241420156-offer-add-urgent.js b/migrations/201909241420156-offer-add-urgent.js
@@ -0,0 +1,12 @@
+
+module.exports = {
+    up: async (queryInterface, Sequelize) =>
+        queryInterface.addColumn(
+            'offers',
+            'urgent',
+            {
+                type: Sequelize.BOOLEAN,
+            },
+        ),
+    down: queryInterface => queryInterface.removeColumn('offers', 'urgent'),
+};
diff --git a/models/offers.js b/models/offers.js
@@ -16,6 +16,7 @@ module.exports = (sequelize, DataTypes) => {
         blue_litigation_hash: DataTypes.STRING,
         green_litigation_hash: DataTypes.STRING,
         task: DataTypes.STRING,
+        urgent: DataTypes.BOOLEAN,
         status: DataTypes.STRING,
         message: DataTypes.STRING,
         transaction_hash: DataTypes.STRING(128),

diff --git a/modules/Blockchain.js b/modules/Blockchain.js
@@ -153,10 +153,11 @@ class Blockchain {
      * Pay out tokens
      * @param blockchainIdentity
      * @param offerId
+     * @param urgent
      * @returns {Promise}
      */
-    payOut(blockchainIdentity, offerId) {
-        return this.blockchain.payOut(blockchainIdentity, offerId);
+    payOut(blockchainIdentity, offerId, urgent) {
+        return this.blockchain.payOut(blockchainIdentity, offerId, urgent);
     }
 
     /**
@@ -175,6 +176,7 @@ class Blockchain {
         tokenAmountPerHolder,
         dataSizeInBytes,
         litigationIntervalInMinutes,
+        urgent,
     ) {
         return this.blockchain.createOffer(
             blockchainIdentity,
@@ -188,6 +190,7 @@ class Blockchain {
             tokenAmountPerHolder,
             dataSizeInBytes,
             litigationIntervalInMinutes,
+            urgent,
         );
     }
 
@@ -204,10 +207,11 @@ class Blockchain {
         confirmation3,
         encryptionType,
         holders,
+        urgent,
     ) {
         return this.blockchain.finalizeOffer(
             blockchainIdentity, offerId, shift, confirmation1,
-            confirmation2, confirmation3, encryptionType, holders,
+            confirmation2, confirmation3, encryptionType, holders, urgent,
         );
     }