add ether rating

Author: defi-bear

utils/getRating.js

@@ -96,8 +96,7 @@ const getTotalGasSpent = (gasSpent) => {
 		[5, 10, 15, 20, 25, 30, 35, 40, 45, 50]
 	);
 }
-
-const getEtherRating = (total, max) => {
+const getAssetRating = (total, max) => {
     const v = total * 0.6 + max * 0.4;
     return getNumberByRange(
         v,
@@ -106,6 +105,19 @@ const getEtherRating = (total, max) => {
     )
 }
 
+const getEtherRating = (eth) => {
+    const limit = 5;
+    const highvalue = 30;
+    if (eth > limit)
+        return highvalue;
+    return Math.floor(highvalue * eth / limit);
+    /*return getNumberByRange(
+        eth,
+        [0, 0.00001, 0.1, 0.2, 0.5, 1, 2, 3, 4, 5],
+        [0, 0, 1, 2, 5, 8, 12, 15, 20, 25, 30]
+    )*/
+}
+
 const getBscRating = (bsc) => {
     return getNumberByRange(
         bsc,
@@ -188,7 +200,7 @@ const getAaveRating = (aaveTotal) => {
 
 
 module.exports = { getTotalBlocksNumber, getTotalEth, getGweiRating,
-     getAgeRating, getNonceRating, getTotalGasSpent,
+     getAgeRating, getNonceRating, getTotalGasSpent, getAssetRating,
      getEtherRating, getBscRating, getUniswapRating, getSushiRating,
      getZoraRating, getCompoundRating, getYFIRating, getPickleRating,
      getWBTCRating, getCoverRating, getAaveRating}

utils/ratings.js

@@ -3,7 +3,7 @@ const { currentUnixTimestamp } = require("./time");
 const { getFullDetail } = require('./zerion');
 const { getDefiInfo } = require('./defiSDK');
 const { getTotalBlocksNumber, getTotalEth, getGweiRating,
-     getAgeRating, getNonceRating, getTotalGasSpent,
+     getAgeRating, getNonceRating, getTotalGasSpent, getAssetRating,
      getEtherRating, getBscRating, getUniswapRating, getSushiRating,
      getZoraRating, getCompoundRating, getYFIRating,
      getPickleRating, getWBTCRating, getCoverRating, getAaveRating } = require('./getRating');
@@ -77,8 +77,9 @@ const getAccountMainInfo = (account) => {
                     maxNonce,
                     Number(totalGasSpent),
                     info.portfolio.total_value,
-                    info.portfolio.bsc_assets_value,
                     info.max,
+                    info.portfolio.bsc_assets_value,
+                    info.eth,                    
                     info.uniswap,
                     info.sushi,
                     info.zora,
@@ -107,6 +108,7 @@ const calculateRating = (
     totalValue,
     maxValue,
     bscValue,
+    ethValue,
     uniswap,
     sushi,
     zora,
@@ -122,7 +124,8 @@ const calculateRating = (
     rating += getAgeRating(age); // 40
     rating += getNonceRating(maxNonce); // 40
     rating += getTotalGasSpent(totalGasSpent); // 50
-    rating += getEtherRating(totalValue, maxValue); // 50
+    rating += getAssetRating(totalValue, maxValue); // 50
+    rating += getEtherRating(ethValue); // 30
     rating += getBscRating(bscValue); // 20
     rating += getUniswapRating(uniswap.sent + uniswap.received + uniswap.trading); //30
     rating += getSushiRating(sushi.sent + sushi.received + sushi.trading) // 30

utils/zerion.js

@@ -38,8 +38,8 @@ function get(socketNamespace, requestBody) {
   });
 }
 
-const getAssets = (address) => {
-	console.log("getAssets", address);
+const getTokenBalance = (tokenType, address) => {
+	//console.log("getTokenBalance", address);
   const assetsSocket = {
       namespace: 'address',
       socket: io(`${BASE_URL}address`, {
@@ -65,12 +65,13 @@ const getAssets = (address) => {
       let total = 0;
       for(key in assets) {
         const item = assets[key];
-        const {asset: { name, price, decimals }, quantity} = item;
+        const {asset: { name, price, symbol,  decimals }, quantity} = item;
+        if (tokenType != symbol)
+          continue;
         const q = quantity / Math.pow(10, decimals);
-        if (price)
-          total += price.value * q;
+        return q;
       }
-      return total;
+      return 0;
     });
 }
 
@@ -824,7 +825,8 @@ const getFullDetail = (address) => {
     getPickleTransactions(address),
     getWBTCTransactions(address),
     getCoverTransactions(address),
-    getAaveTransactions(address)
+    getAaveTransactions(address),
+    getTokenBalance('ETH', address),
   ]).then(res => {
     return {
       transactions: res[0],
@@ -838,19 +840,19 @@ const getFullDetail = (address) => {
       pickle: res[8],
       wbtc: res[9],
       cover: res[10],
-      aave: res[11]
+      aave: res[11],
+      eth: res[12]
     }
   })
 }
 
 //0x70e36f6bf80a52b3b46b3af8e106cc0ed743e8e4
 //0x638aF69053892CDD7Ad295fC2482d1a11Fe5a9B7
 //0xd4004f07d7b746103f2d9b4e5b5a540864526bec
-// getZoraTransactions("0x7A6d4a30f800c63965c68590e99C5b661948Aaa3").then(res => {
-//   console.log(res);
-// });
+// getFullDetail("0x7a6d4a30f800c63965c68590e99c5b661948aaa3").then(res => {
+//    console.log(res);
+//  });
 module.exports = {
-  getAssets,
   getLockedAssets,
   getMaxInHistory,
   getUniswapTransactions,