From 83377764a694a24b175b9bc29f9208dea19dc5a1 Mon Sep 17 00:00:00 2001
From: Janko Simonovic <simonovic86@gmail.com>
Date: Fri, 7 Dec 2018 23:12:42 +0100
Subject: [PATCH] develop-master sync (#795)

* Profile contract cleanup (#785)

* Set default minimal stake to 1000 TRAC

* Simplify token withdrawal logic

* Update truffle test

* Require nodeID and enable nodeID change (#777)

* Require a node to submit a nodeId when creating a profile

* Add a function for changing a profile's nodeId

* Update abi file for profile smart contract

* Handle failed finalize offer (#788)

* Bugfix/hotfixes (#789)

* bump version (#790)

* update config (#793)
---
 config/config.json | 4 ++--
 package-lock.json  | 2 +-
 package.json       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/config.json b/config/config.json
index 95a6e76ebe..9663bdc0ec 100644
--- a/config/config.json
+++ b/config/config.json
@@ -498,8 +498,8 @@
     "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_min_token_price": "10000000000000000000",
+    "dh_max_holding_time_in_minutes": 525600,
+    "dh_min_token_price": "20000000000000000000",
     "dh_min_litigation_interval_in_minutes": 5,
     "deposit_on_demand": true,
     "dc_choose_time": 600000,
diff --git a/package-lock.json b/package-lock.json
index e40e4595cd..2d7a86ede3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "origintrail_node",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1457e548e2..ac9dffbe41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "origintrail_node",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "description": "OriginTrail node",
   "main": ".eslintrc.js",
   "config": {