fixed bug with validating gas price and multiple promises resolving on /api/token get request

Author: ar-to

README.md

@@ -53,11 +53,11 @@ GANACHE_MIGRATE_ADDRESS=0xcf068555df7eab0a9bad97829aa1a187bbffbdba
 ROPSTEN_MIGRATE_ADDRESS=0xa8ebf36b0a34acf98395bc5163103efc37621052
 ```
 
-Currently, the best way to change the network you want to have the API connect web3 to, is to change the `NODE_URL`. So you can have multiple values but only have one uncommented. Below the second will be used.
+Currently, the best way to change the network you want to have the API connect web3 to, is to change the `NODE_URL`. So you can have multiple values but only have one uncommented. The example below will make the second url enabled.
 
 ```
 #NODE_URL=http://127.0.0.1:7545
-NODE_URL=http://10.10.0.163:8545
+NODE_URL=http://127.0.0.1:8545
 ```
 
 **Remember to restart your server after changing environment variables. If running nodemon run `npm run nodemon` again**

server/app/helpers/ethereum.js

@@ -149,7 +149,6 @@ async function processTxInfoData(txObject) {
     // get gas prices 
     const getCurrentGasPrices = async () => {
       let response = await axios.get(gasAPI)
-      // let response = await axios.get('https://ethgasstation.info/json/ethgasAPI.json')
       let prices = {
         low: response.data.safeLow / 10,
         medium: response.data.average / 10,
@@ -163,12 +162,17 @@ async function processTxInfoData(txObject) {
     let gasPriceTypeCustom = txObject.gasPrice != null ? txObject.gasPrice.toLowerCase() : null;
     // validate gasPrice
     let gasPrice;
-    if (gasPrices[gasPriceTypeCustom] === undefined){
+    if(gasPriceTypeCustom == null) {
       gasPrice = gasPriceDefault
-      reject(new Error('gasPrice is invalid'))
     } else {
-      gasPrice = gasPrices[gasPriceTypeCustom] * 1000000000;
+      if (gasPrices[gasPriceTypeCustom] === undefined){
+        gasPrice = gasPriceDefault
+        reject(new Error('gasPrice is invalid'))
+      } else {
+        gasPrice = gasPrices[gasPriceTypeCustom] * 1000000000;
+      }
     }
+    console.log('gasPrice',gasPrice)
     // let gasPrice = gasPriceTypeCustom != null ? gasPrices[gasPriceTypeCustom] * 1000000000 : gasPriceDefault;
 
     // set tx object to calculate transaction gas

server/app/helpers/token.js

@@ -95,23 +95,23 @@ Token = {
           tokenInstance.name(),
           tokenInstance.symbol(),
           tokenInstance.decimals(),
-          tokenInstance.totalSupply()
+          tokenInstance.totalSupply(),
+          tokenInstance.balanceOf(value.owner)
         ]
-        Promise.all(infoArray).then((values) => {
+        return Promise.all(infoArray).then((values) => {
           obj.tokenName = values[0];
           obj.tokenSymbol = values[1];
           obj.tokenDecimals = values[2];
-          obj.tokenInitialSupply = values[3];
+          obj.totalSupply = values[3];
+          obj.tokenBalance = values[4];
+          return obj;
         })
         //initial variable but changed by addTokenToTotalSupply()
         // tokenInstance.INITIAL_SUPPLY().then((value) => {
         //   obj.tokenInitialSupply = value;
         // });
-        return tokenInstance.balanceOf(value.owner);
       }).then(function (result) {
-        // obj.tokenBalance = result.toFixed(obj.tokenDecimals);
-        obj.tokenBalance = result;
-        return obj;
+        return result;
       }).catch(function (err) {
         console.log(err.message);
         return obj.error = err.message;