Merge pull request #50 from marcelooblan2016/hotfix/marketdata_adjust…

…ment fix on marketdata
marcelooblan2016 · Jan 18, 2022 · e904e11 · e904e11
2 parents 1c3d77b + 57b715d
commit e904e11
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/dist/Records/Migrations/tokenContracts.js b/dist/Records/Migrations/tokenContracts.js
@@ -121,16 +121,5 @@ exports.default = [
         "site": "https://www.wbtc.network/",
         "network_url": "https://polygonscan.com/token/0x1bfd67037b42cf73acf2047067bd4f2c47d9bfd6",
         "minimum_balance": 0
-    },
-    {
-        "network_slug": "matic-mainnet",
-        "name": "Wrapped Ether",
-        "slug": "weth",
-        "stablecoin": false,
-        "contract": "0x7ceb23fd6bc0add59e62ac25578270cff1b9f619",
-        "decimals": 18,
-        "site": "https://weth.io/",
-        "network_url": "https://polygonscan.com/token/0x7ceb23fd6bc0add59e62ac25578270cff1b9f619",
-        "minimum_balance": 0
     }
 ];
diff --git a/dist/Trader/trader.js b/dist/Trader/trader.js
@@ -80,17 +80,21 @@ class Trader {
             return false;
         }).map(function (token) {
             var _a;
-            let tokenMarket = (_a = mappedMarketData.filter((tokenMarket) => {
+            let tokenMarket = (_a = mappedMarketData.map((tokenMarket) => {
                 let marketSlugFamiliars = [
                     { 'slug': 'wmatic', 'symbol': 'matic' },
                     { 'slug': 'weth', 'symbol': 'eth' },
                     { 'slug': 'wbtc', 'symbol': 'btc' },
                 ];
                 for (let marketSlug of marketSlugFamiliars) {
                     if (marketSlug.symbol == tokenMarket.symbol) {
-                        return true;
+                        tokenMarket.symbol = marketSlug.slug;
+                        break;
                     }
                 }
+                return tokenMarket;
+            })
+                .filter((tokenMarket) => {
                 return tokenMarket.symbol == token.slug;
             })[0]) !== null && _a !== void 0 ? _a : {};
             let swapHistoryDataFound = swapHistory_1.default.read({ slug: token.slug });

diff --git a/src/Trader/trader.ts b/src/Trader/trader.ts
@@ -97,19 +97,24 @@ class Trader {
 
             return false;
         }).map( function (token) {
-            let tokenMarket = mappedMarketData.filter( (tokenMarket) => {
+            let tokenMarket = mappedMarketData.map((tokenMarket) => {
                 let marketSlugFamiliars: any = [
                     {'slug': 'wmatic', 'symbol': 'matic'},
                     {'slug': 'weth', 'symbol': 'eth'},
                     {'slug': 'wbtc', 'symbol': 'btc'},
                 ];
-                
+
                 for(let marketSlug of marketSlugFamiliars) {
                     if (marketSlug.symbol == tokenMarket.symbol) {
-                        return true;
+                        tokenMarket.symbol = marketSlug.slug;
+                        break;
                     }
                 }
-
+
+                return tokenMarket;
+            })
+            .filter( (tokenMarket) => {
+
                 return tokenMarket.symbol == token.slug;
             })[0] ?? {};
             let swapHistoryDataFound = swapHistory.read({slug: token.slug});
@@ -201,7 +206,6 @@ class Trader {
         // ready to buy - select profitable tokens
         if (stableCoinWithBalance.balance >= 1) {
             let tokenWithBalanceAndMarketData = this.tokenWithBalanceAndMarketData(tokenBalances, mappedMarketData, 2);
-
             let tokenWithBalanceAndMarketDataExceptStableCoin = tokenWithBalanceAndMarketData
             .filter( (token) => token.slug != this.stableCoin.slug);
             stableCoinWithBalance = tokenWithBalanceAndMarketData