impermax-sdk 2.1.385 → 2.1.387

package/lib/config/contracts/routers.js

@@ -77,7 +77,7 @@ exports.ROUTER = {
     [types_1.Networks.Sxnetwork]: {},
     [types_1.Networks.Base]: {
         [types_1.Factory.SOLV2]: '0x98b55cd14450f56355cdefa74d9443d9c48b78cd',
-        [types_1.Factory.SOL_STABLE]: '',
+        [types_1.Factory.SOL_STABLE]: '0x7d2dd9a0421041ec50804965c42fca09a7a6794e',
         [types_1.Factory.V2V2]: '0x46b9B1a483f5e64A20BBbeeCbf54224167B699df'
     },
     [types_1.Networks.Scroll]: {
@@ -96,6 +96,7 @@ exports.ROUTER = {
     },
     [types_1.Networks.Sonic]: {
         [types_1.Factory.SOLV2]: '0xB3B140dBcBC649eCeac74f30487A338e9D129331',
+        [types_1.Factory.SOL_STABLE]: '0xD995C49266E3391baFe5dd7135c34018f63eE75C'
     },
     [types_1.Networks.Linea]: {
         [types_1.Factory.SOLV2]: '0x6E658aC2f3C061719C52FB1E56b064cE165CAF31',

package/lib/offchain/offchainPriceHelper.d.ts

@@ -7,8 +7,6 @@ export default class OffchainPriceHelper {
     private debankTokensPrice;
     private coingeckoInitialized;
     private coingeckoTokenPrices;
-    private geckoTerminalInitialized;
-    private geckoTerminalTokenPrices;
     constructor(offchainMultichain: OffchainMultichain);
     cleanCache(): void;
     private addPriceIfMissing;
@@ -18,8 +16,6 @@ export default class OffchainPriceHelper {
     }>;
     private getAllCoingeckoPrices;
     private getCoingeckoTokenPrice;
-    private getAllGeckoTerminalPrices;
-    private getGeckoTerminalTokenPrice;
     private getDexscreenerTokenPrice;
     private initializeDebankTokenPrice;
     getDebankTokenPrice(network: Networks, tokenAddress: Address): Promise<number>;

package/lib/offchain/offchainPriceHelper.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const types_1 = require("../config/types");
 // coingecko has priority over debank for initialized tokens
 const coingecko_ids = {
     //Polygon
@@ -59,6 +58,11 @@ const coingecko_ids = {
     "0xce1581d7b4ba40176f0e219b2cac30088ad50c7a": "pearl",
     // blast
     "0x52f847356b38720b55ee18cb3e094ca11c85a192": "fenix",
+    "0xb785ee8752b8bf3b0c8d9857f24b491e8c0a3d92": "coinbase-wrapped-btc",
+    // sonic
+    "0x3333b97138d4b086720b5ae8a7844b1345a33333": "shadow-2",
+    // linea
+    "0x894134a25a5fac1c2c26f1d8fbf05111a3cb9487": "grai"
 };
 const dexscreener_ids = {
     // ibex on scroll
@@ -79,49 +83,19 @@ const dexscreener_ids = {
     "0xc38464250f51123078bbd7ea574e185f6623d037": "optimism",
     // fantom-bomb on scroll (removed from coingecko)
     "0x6b6882f7642ee1c15f12b51f1a4988b3e7e29f5c": "scroll",
+    // EliteringssUSDC
+    "0xd4aa386bfceeedd9de0875b3ba07f51808592e22": "sonic"
 };
-const geckoTerminalTokens = [
-    "arbitrum:0xde903e2712288a1da82942dddf2c20529565ac30",
-    "arbitrum:0x2e9a6df78e42a30712c10a9dc4b1c8656f8f2879",
-    "arbitrum:0x3b475f6f2f41853706afc9fa6a6b8c5df1a2724c",
-    "polygon:0x1d607faa0a51518a7728580c238d912747e71f7a",
-    "polygon:0xc25351811983818c9fe6d8c580531819c8ade90f",
-    "polygon:0x4eac4c4e9050464067d673102f8e24b2fcceb350",
-    "polygon:0xc25351811983818c9fe6d8c580531819c8ade90f"
-];
-/** Map of our network to geckoTerminal network id */
-const GECKOTERMINAL_IDS = {
-    [types_1.Networks.Avalanche]: "avax",
-    [types_1.Networks.Mainnet]: "eth",
-    [types_1.Networks.Polygon]: "polygon_pos",
-    [types_1.Networks.Arbitrum]: "arbitrum",
-    [types_1.Networks.Fantom]: "ftm",
-    [types_1.Networks.Base]: "base",
-    [types_1.Networks.Scroll]: "scroll",
-    [types_1.Networks.Optimism]: "optimism",
-    [types_1.Networks.Real]: "re-al",
-    [types_1.Networks.Mantle]: "mantle",
-    [types_1.Networks.Canto]: "canto",
-    [types_1.Networks.Blast]: "blast",
-    [types_1.Networks.Sonic]: "sonic",
-    [types_1.Networks.Linea]: "linea",
-    [types_1.Networks.ZksyncEra]: "zksync",
-};
-const MAX_GECKO_COINS = 30;
-// NOTE: Geckoterminal and coingecko functions copied from our indexer
 // Sources used so far:
 // 1. Our subgraphs
 // 2. Coingecko
-// 3. Geckoterminal
-// 4. DexScreener
+// 3. DexScreener
 class OffchainPriceHelper {
     // No need for dexscreener mutex since it allows only one token per call
     constructor(offchainMultichain) {
         // Initialize the subgraph prices for each network
         this.subgraphTokensPrice = {};
         this.coingeckoInitialized = null;
-        this.geckoTerminalInitialized = null;
-        this.geckoTerminalTokenPrices = {};
         this.offchainMultichain = offchainMultichain;
         this.debankTokensPrice = {};
     }
@@ -212,53 +186,7 @@ class OffchainPriceHelper {
         return geckoPrice || 0;
     }
     /* -----------------------------------------------------------------------
-     *  3. GeckoTerminal
-     * ----------------------------------------------------------------------*/
-    async getAllGeckoTerminalPrices() {
-        // GeckoTerminal only allows to fetch multiple tokens from a single network in 1 api call
-        // so we group all the tokens passed by network to loop through each one.
-        const tokensByChain = geckoTerminalTokens.reduce((acc, tokenId) => {
-            const network = tokenId.split(":")[0];
-            if (!acc[network])
-                acc[network] = [];
-            acc[network].push(tokenId);
-            return acc;
-        }, {});
-        // Go through each network
-        try {
-            for (const [network, tokens] of Object.entries(tokensByChain)) {
-                const geckoNetwork = GECKOTERMINAL_IDS[network];
-                if (!geckoNetwork) {
-                    console.error(`GeckoTerminal ID missing for network: ${network}`);
-                    continue;
-                }
-                for (let i = 0; i < tokens.length; i += MAX_GECKO_COINS) {
-                    const maxTokens = tokens.slice(i, i + MAX_GECKO_COINS);
-                    const tokenIds = maxTokens.map((tokenId) => tokenId.split(":")[1]).join(",");
-                    const { data } = await fetch(`https://api.geckoterminal.com/api/v2/simple/networks/${geckoNetwork}/token_price/${tokenIds}`).then((res) => res.json());
-                    for (const tokenId of maxTokens) {
-                        const tokenAddress = tokenId.split(":")[1];
-                        const tokenPrice = data.attributes.token_prices[tokenAddress];
-                        if (tokenPrice)
-                            this.geckoTerminalTokenPrices[tokenAddress] = tokenPrice;
-                    }
-                }
-            }
-        }
-        catch (error) {
-            console.error("Gecko prices fail: %s", error.message);
-        }
-    }
-    ;
-    async getGeckoTerminalTokenPrice(tokenAddress) {
-        if (!this.geckoTerminalInitialized)
-            this.geckoTerminalInitialized = this.getAllGeckoTerminalPrices();
-        await this.geckoTerminalInitialized;
-        const geckoPrice = this.geckoTerminalTokenPrices[tokenAddress];
-        return geckoPrice || 0;
-    }
-    /* -----------------------------------------------------------------------
-     *  4. Dexscreener
+     *  3. Dexscreener
      * ----------------------------------------------------------------------*/
     async getDexscreenerTokenPrice(tokenAddress) {
         try {
@@ -298,11 +226,6 @@ class OffchainPriceHelper {
             if (result)
                 return result;
         }
-        if (geckoTerminalTokens.some(token => token.endsWith(tokenAddress.toLowerCase()))) {
-            const result = await this.getGeckoTerminalTokenPrice(tokenAddress);
-            if (result)
-                return result;
-        }
         return 0;
     }
     // TODO: Simplify this logic and reove the old temporaries we dont need anymore

package/lib/offchain/offchainPriceHelperV2.js

@@ -25,8 +25,6 @@ class OffchainPriceHelper {
     async getTokenPriceOld(network, tokenAddress) {
         // Initializes v1 prices once if necessary
         const price = await this.offchainPriceHelperV1.getDebankTokenPrice(network, tokenAddress);
-        if (price === 0)
-            console.log("Missing price: ", network, tokenAddress);
         return price;
     }
     /* -----------------------------------------------------------------------
@@ -66,9 +64,9 @@ class OffchainPriceHelper {
         // in case diff tokens have same address on diff networks
         const key = `${chainId_1.CHAIN_IDS[network]}-${tokenAddress.toLowerCase()}`;
         // First try get token price from our price-aggregator
-        const token = apiData?.tokens[key];
-        if (token)
-            return parseFloat(token.derivedUSD);
+        const priceUsd = apiData?.tokens[key]?.priceUsd;
+        if (priceUsd)
+            return parseFloat(priceUsd);
         // Fallback to price old
         return this.getTokenPriceOld(network, tokenAddress);
     }

package/lib/offchain/queries/apis/ponder/index.js

@@ -236,7 +236,7 @@ class PonderQueryBuilder {
             return this.userQueryV3(account, network, factory);
         return (0, graphql_tag_1.default) `{
       user(id: "${account.toLowerCase()}") {
-        collateralPositions(limit:1000, where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}"}) {
+        collateralPositions(limit:1000, where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}", balance_not: "0"}) {
           items { 
             balance
             collateral {
@@ -246,7 +246,7 @@ class PonderQueryBuilder {
             }
           }
         }
-        supplyPositions(limit:1000, where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}"}) {
+        supplyPositions(limit:1000, where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}", balance_not: "0"}) {
           items { 
             balance
             cumulativeEarnings
@@ -261,7 +261,7 @@ class PonderQueryBuilder {
             }
           }
         }
-        borrowPositions(limit:1000, where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}"}) {
+        borrowPositions(limit:1000, where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}", borrowBalance_not: "0"}) {
           items { 
             borrowBalance
             borrowIndex

package/lib/offchain/queries/apis/thegraph/index.js

@@ -141,7 +141,7 @@ class TheGraphQueryBuilder {
         factory;
         return (0, graphql_tag_1.default) `{
       user(id: "${account.toLowerCase()}") {
-        collateralPositions(first:1000) {
+        collateralPositions(first: 1000, where: { balance_gt: "0" }) {
           balance
           collateral {
             lendingPool {
@@ -149,7 +149,7 @@ class TheGraphQueryBuilder {
             }
           }
         }
-        supplyPositions(first:1000) {
+        supplyPositions(first:1000, where: { balance_gt: "0" }) {
           balance
           lastExchangeRate
           cumulativeEarnings
@@ -162,7 +162,7 @@ class TheGraphQueryBuilder {
             }
           }
         }
-        borrowPositions(first:1000) {
+        borrowPositions(first:1000, where: { borrowBalance_gt: "0" }) {
           borrowBalance
           borrowIndex
           borrowable {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impermax-sdk",
-  "version": "2.1.385",
+  "version": "2.1.387",
   "description": "",
   "main": "./lib/index.js",
   "module": "./lib/index.js",