Merge pull request #8 from Alethio/v1.4.1

V1.4.1

Author: baxy

.env.sample

@@ -91,8 +91,9 @@ KOHERA_DB_REQUEST_TIMEOUT=100
 KOHERA_API_REQUEST_TIMEOUT=100
 KOHERA_QUEUE_REQUEST_TIMEOUT=50
 
-INFURA_API_URL=https://api.infura.io/v1/jsonrpc
-INFURA_API_KEY=
+INFURA_URL=infura.io/v3
+INFURA_PROJECT_ID=
+INFURA_PROJECT_SECRET=
 
 ETHSTATS_BLOB_API_URL=https://blob-api.ethstats.io/v1
 ETHSTATS_BLOB_API_KEY=

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.4.1] - 2019-04-01
+- Remove "sprintf" npm package due to memory leaks
+- Update Infura library to use latest v3 API
+- Update npm dependent packages to latest versions
+
 ## [1.4.0] - 2019-03-14
 - Add support for PostgreSQL
 - Add docker compose example for cluster mode with PostgreSQL persistence

app/bootstrap.js

@@ -6,7 +6,6 @@ import dotenv from 'dotenv';
 import lodash from 'lodash';
 import meow from 'meow';
 import chalk from 'chalk';
-import sprintfJS from 'sprintf-js';
 import Cassandra from 'cassandra-driver';
 import Postgres from 'pg';
 import Redis from 'ioredis';
@@ -48,7 +47,6 @@ const diContainer = {
   lodash,
   meow,
   chalk,
-  sprintfJS,
   geoIp,
   d3,
   bigNumberUtils

app/lib/Infura.js

@@ -9,25 +9,27 @@ export default class Infura {
     this.bigNumberUtils = diContainer.bigNumberUtils;
 
     this.network = this.appConfig.NETWORK;
-    this.apiUrl = this.appConfig.INFURA_API_URL;
-    this.apiKey = this.appConfig.INFURA_API_KEY;
+    this.url = this.appConfig.INFURA_URL;
+    this.projectId = this.appConfig.INFURA_PROJECT_ID;
+    this.projectSecret = this.appConfig.INFURA_PROJECT_SECRET;
   }
 
-  get(params) {
+  request(jsonRpcObject) {
     let requestOptions = {
-      method: 'GET',
-      uri: `${this.apiUrl}/${this.network}/${params.method}?token=${this.apiKey}`,
-      json: true
+      method: 'POST',
+      headers: {
+        Authorization: `Basic ${Buffer.from(':' + this.projectSecret).toString('base64')}`
+      },
+      uri: `https://${this.network}.${this.url}/${this.projectId}`,
+      json: false,
+      body: JSON.stringify(jsonRpcObject)
     };
 
-    if (params.params) {
-      requestOptions.uri += `&params=${params.params}`;
-    }
-
     this.log.debug(`Infura request: ${JSON.stringify(requestOptions)}`);
 
     return this.requestPromise(requestOptions).then(requestResult => {
       let result = null;
+      requestResult = JSON.parse(requestResult);
 
       if (requestResult.error) {
         this.log.error(`Infura => ${requestResult.error.message}`);
@@ -37,25 +39,29 @@ export default class Infura {
 
       return result;
     }).catch(error => {
-      let errorMessage = this.lodash.isObject(error.error) ? ((error.error.body === undefined) ? error.error : error.error.body.errors[0]) : error.message;
-      this.log.error(`Infura => ${errorMessage}`);
+      this.log.error(`Infura => ${JSON.stringify(error)}`);
     });
   }
 
   getBlockByNumber(number) {
-    let requestParams = {
+    let jsonRpcObject = {
+      jsonrpc: '2.0',
       method: 'eth_getBlockByNumber',
-      params: `["${this.bigNumberUtils.getHex(number, true)}",true]`
+      params: [this.bigNumberUtils.getHex(number, true), false],
+      id: 1
     };
 
-    return this.get(requestParams);
+    return this.request(jsonRpcObject);
   }
 
   getLastBlockNumber() {
-    let requestParams = {
-      method: 'eth_blockNumber'
+    let jsonRpcObject = {
+      jsonrpc: '2.0',
+      method: 'eth_blockNumber',
+      params: [],
+      id: 1
     };
 
-    return this.get(requestParams);
+    return this.request(jsonRpcObject);
   }
 }

app/lib/Logger.js

@@ -2,7 +2,6 @@ export default class Logger {
   constructor(diContainer) {
     this.appConfig = diContainer.appConfig;
     this.chalk = diContainer.chalk;
-    this.sprintf = diContainer.sprintfJS.sprintf;
     this.prometheusMetrics = null;
 
     this.showDateTime = this.appConfig.LOG_SHOW_DATETIME;
@@ -15,7 +14,7 @@ export default class Logger {
 
   _log(type, string) {
     let dateTime = new Date().toISOString().replace('T', ' ').replace('Z', '');
-    let resultString = `${(this.showDateTime) ? dateTime + ' - ' : ''}%s: ${string}`;
+    let resultString = `${(this.showDateTime) ? dateTime + ' - ' : ''}%LOG-TYPE%: ${string}`;
 
     if (this.showAsJson) {
       let output = {
@@ -30,16 +29,16 @@ export default class Logger {
           console.log(string);
           break;
         case 'info':
-          console.log(this.chalk.white(this.sprintf(resultString, 'INFO')));
+          console.log(this.chalk.white(resultString.replace('%LOG-TYPE%', 'INFO')));
           break;
         case 'debug':
-          console.log(this.chalk.cyan(this.sprintf(resultString, 'DEBUG')));
+          console.log(this.chalk.cyan(resultString.replace('%LOG-TYPE%', 'DEBUG')));
           break;
         case 'warning':
-          console.log(this.chalk.yellow(this.sprintf(resultString, 'WARNING')));
+          console.log(this.chalk.yellow(resultString.replace('%LOG-TYPE%', 'WARNING')));
           break;
         case 'error':
-          console.log(this.chalk.red(this.sprintf(resultString, 'ERROR')));
+          console.log(this.chalk.red(resultString.replace('%LOG-TYPE%', 'ERROR')));
           break;
         default:
           console.log('Logger: Unknown type');