2.0.58 (#950)

* Update version to 2.0.58
* Reduce the number of blockchain calls in getAllPastEvents
* Increase the time interval for getAllPastEvents calls

.travis.yml

@@ -5,7 +5,8 @@ node_js:
 env:
   - NODE_ENV=development ARTIFACTS_DIR=$TRAVIS_BUILD_DIR/artifacts CUCUMBER_ARTIFACTS_DIR=$ARTIFACTS_DIR/cucumber BDD_SECTION=first
   - NODE_ENV=development ARTIFACTS_DIR=$TRAVIS_BUILD_DIR/artifacts CUCUMBER_ARTIFACTS_DIR=$ARTIFACTS_DIR/cucumber BDD_SECTION=second
-
+cache:
+  npm: false
 sudo: enabled
 addons:
   apt:

modules/Blockchain/Ethereum/index.js

@@ -515,13 +515,27 @@ class Ethereum {
         );
     }
 
+    /**
+     * Gets the current block if one wasn't retrieved in the last 10 seconds
+     * @returns {int}
+     */
+    async getCurrentBlock() {
+        const timeout = 10000;
+        if (this.lastBlockCheck == null || this.lastBlockCheck + timeout < Date.now()) {
+            this.lastBlock = await this.web3.eth.getBlockNumber();
+            this.lastBlockCheck = Date.now();
+        }
+
+        return this.lastBlock;
+    }
+
     /**
      * Gets all past events for the contract
      * @param contractName
      */
     async getAllPastEvents(contractName) {
         try {
-            const currentBlock = await this.web3.eth.getBlockNumber();
+            const currentBlock = await this.getCurrentBlock();
 
             let fromBlock = 0;
 

modules/service/dh-service.js

@@ -170,7 +170,7 @@ class DHService {
 
         await this.commandExecutor.add({
             name: 'dhOfferHandleCommand',
-            delay: 15000,
+            delay: 45000,
             data,
             transactional: false,
         });

ot-node.js

@@ -566,15 +566,15 @@ class OTNode {
     listenBlockchainEvents(blockchain) {
         log.info('Starting blockchain event listener');
 
-        const delay = 10000;
+        const delay = 20000;
         let working = false;
         let deadline = Date.now();
-        setInterval(() => {
+        setInterval(async () => {
             if (!working && Date.now() > deadline) {
                 working = true;
-                blockchain.getAllPastEvents('HOLDING_CONTRACT');
-                blockchain.getAllPastEvents('PROFILE_CONTRACT');
-                blockchain.getAllPastEvents('APPROVAL_CONTRACT');
+                await blockchain.getAllPastEvents('HOLDING_CONTRACT');
+                await blockchain.getAllPastEvents('PROFILE_CONTRACT');
+                await blockchain.getAllPastEvents('APPROVAL_CONTRACT');
                 deadline = Date.now() + delay;
                 working = false;
             }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "origintrail_node",
-  "version": "2.0.57",
+  "version": "2.0.58",
   "description": "OriginTrail node",
   "main": ".eslintrc.js",
   "config": {