Version 2.0.25

.travis.yml

@@ -13,7 +13,7 @@ before_script:
   - cp .origintrail_noderc.travis .origintrail_noderc
   - npm run bootstrap
   - npm install -g [email protected] &> /dev/null
-  - npm install -g truffle@beta &> /dev/null
+  -  npm install -g truffle@5.0.0-beta.1 &> /dev/null
 script:
   - npm run lint
   - 'if [ "$TRAVIS_EVENT_TYPE" != "push" ]; then npm run test:bdd; fi'

README.md

@@ -9,7 +9,7 @@ __OriginTrail is building first Purpose-built Protocol for Supply Chains Based o
 
 This repository contains a work-in-progress code for a network node. Please have in mind that code is still __testnet phase__ developed where all main features will work, with some limitations. 
 
-__Test Network__ is available from end of June 2018 as a beta of our protocol, while __Main Network__ is scheduled for Q3 2018. For further information about our roadmap please see our [website](https://origintrail.io/roadmap).
+__Test Network__ is available from end of June 2018 as a beta of our protocol, while __Main Network__ is scheduled for Q1 2019. For further information about our roadmap please see our [website](https://origintrail.io/roadmap).
 
 [Please see our main documentation page for more information](http://docs.origintrail.io)
 

config/config.json

@@ -255,7 +255,7 @@
       "network_id": "rinkeby",
       "gas_limit": "1500000",
       "gas_price": "20000000000",
-      "hub_contract_address": "0xc362EEf31796378e730E5C69BD9B32Bb4B77ec31",
+      "hub_contract_address": "0x6C314872A7e97A6F1dC7De2dc43D28500dd36f22",
       "rpc_node_host": "https://rinkeby.infura.io/1WRiEqAQ9l4SW6fGdiDt",
       "rpc_node_port": "",
       "plugins": [
@@ -276,7 +276,7 @@
     "network": {
       "hostname": "127.0.0.1",
       "id": "StablenetV1.0.0",
-      "bootstraps": ["https://82.196.10.12:5278/#ca87147a501adf39eaa648c2b09735559ee3511d"],
+      "bootstraps": ["https://82.196.10.12:5278/#e2f7ab11d0dd34595dfb2e71b4937ec8d790df84"],
       "remoteWhitelist": ["54.93.223.161", "127.0.0.1"],
       "solutionDifficulty": 14,
       "identityDifficulty": 12

install-aws.sh

@@ -26,6 +26,5 @@ sudo yum install patch
 cd ~
 git clone -b master https://github.com/OriginTrail/ot-node.git
 cd ot-node && npm install
-cp .env.example .env
 
-echo "Installation complete. Please configure .env file."
+echo "Installation complete. Please configure .origintrail_noderc file."

install.sh

@@ -66,9 +66,6 @@ sudo pip3 install python-dotenv
 sudo apt-get install git
 
 git clone -b master https://github.com/OriginTrail/ot-node.git
-cd ot-node
-mkdir keys data &> /dev/null
-cp .env.example .env
+cd ot-node && npm install
 
-npm install
-echo "Installation complete. Please configure .env file."
+echo "Installation complete. Please configure .origintrail_noderc file."

modules/Blockchain.js

@@ -421,8 +421,8 @@ class Blockchain {
         return this.blockchain.nodeHasApproval(nodeId);
     }
 
-    async getBalances() {
-        return this.blockchain.getBalances();
+    async hasEnoughFunds() {
+        return this.blockchain.hasEnoughFunds();
     }
 
     /**