Skip to content

Commit

Permalink
develop-master sync (#795)
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
simonovic86 authored Dec 7, 2018
1 parent f46cb4e commit 8337776
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "origintrail_node",
"version": "2.0.30",
"version": "2.0.31",
"description": "OriginTrail node",
"main": ".eslintrc.js",
"config": {
Expand Down

0 comments on commit 8337776

Please sign in to comment.