impermax-sdk 2.1.441 → 2.1.443

package/lib/config/whitelist.js

@@ -34,7 +34,9 @@ exports.WHITELISTED_PAIRS = {
             "0x0b96755241DeAccc83BF8b4eda314d81905Cd7Bd",
             "0x4f667a0220EF7c1284C763c33eD86f9413a177B3",
             "0x375ff4a46eb1e75f702e9be411bf0ac96d8e55dd",
-            "0x679d91d08eb980c6f1b69632eca139f006e4b914" // id/avax
+            "0x679d91d08eb980c6f1b69632eca139f006e4b914",
+            "0x237dC61F6346e931A0Ff8801D8cAB566cE1c7F94",
+            "0x03e92DF133Fa319e55D806687c46118072532433" // fbomb/usdc
         ],
     },
     [types_1.Networks.Moonriver]: {

package/lib/offchain/offchainMultichain.d.ts

@@ -55,6 +55,21 @@ export interface LendingPoolListParams {
     highTvl?: boolean;
     pairState?: PairState;
 }
+export interface MultichainTvlData {
+    totalSuppliedUSD: number;
+    totalBorrowedUSD: number;
+    totalCollateralUSD: number;
+}
+declare enum TvlDataSources {
+    defillama = 0,
+    sdk = 1
+}
+export interface MultichainTvlParams {
+    networks?: Array<Networks>;
+    version?: LendingPoolVersion;
+    pairState?: PairState;
+    source?: TvlDataSources;
+}
 export default class OffchainMultichain {
     #private;
     protected offchains: NetworkIndex<Offchain>;
@@ -80,11 +95,16 @@ export default class OffchainMultichain {
     getMultichainAccount(accountAddress: Address): OffchainMultichainAccount;
     getMultichainBorrowersList(params?: BorrowersListParams): Promise<OffchainAccount[]>;
     getActiveAmms(params?: LendingPoolListParams): Promise<Amms[]>;
-    getTvlData(params?: LendingPoolListParams): Promise<{
-        totalSuppliedUSD: number;
-        totalBorrowedUSD: number;
-        totalCollateralUSD: number;
-    }>;
+    /** Gets TVL from defillama */
+    getDefillamaTvlData(params?: MultichainTvlParams): Promise<MultichainTvlData>;
+    /** Gets TVL from SDK. */
+    getSDKTvlData(params?: MultichainTvlParams): Promise<MultichainTvlData>;
+    /**
+     * Returns {@link MultichainTvlData}. Collateral is given by the SDK, while Total Supplied
+     * and Total Borrowed is given by max of SDK/Defillama
+     */
+    getTvlData(params?: MultichainTvlParams): Promise<MultichainTvlData>;
     getImpermaxTvlChart(network?: Networks): Promise<LlamaTvlChart>;
     getNetworkTokens(networks?: Networks[]): Promise<Token[]>;
 }
+export {};

package/lib/offchain/offchainMultichain.js

@@ -45,6 +45,11 @@ var LendingPoolListOrderBy;
     LendingPoolListOrderBy[LendingPoolListOrderBy["SUPPLY_APR"] = 3] = "SUPPLY_APR";
     LendingPoolListOrderBy[LendingPoolListOrderBy["LEVERAGED_APR"] = 4] = "LEVERAGED_APR";
 })(LendingPoolListOrderBy = exports.LendingPoolListOrderBy || (exports.LendingPoolListOrderBy = {}));
+var TvlDataSources;
+(function (TvlDataSources) {
+    TvlDataSources[TvlDataSources["defillama"] = 0] = "defillama";
+    TvlDataSources[TvlDataSources["sdk"] = 1] = "sdk";
+})(TvlDataSources || (TvlDataSources = {}));
 // singleton class
 class OffchainMultichain {
     constructor() {
@@ -210,17 +215,23 @@ class OffchainMultichain {
     /*--------------------------------------------------------*
      *                   Protocol Data
      *--------------------------------------------------------*/
-    async getTvlData(params = {}) {
-        // 1. Try defillama first
+    //
+    // TVL DATA
+    // 
+    /** Gets TVL from defillama */
+    async getDefillamaTvlData(params = {}) {
         try {
             // We cannot filter out llama tvl by pair state, but can filter by network
             const llamaTvlData = await this.getAPRHelper().getTvlData(params.networks);
             return llamaTvlData;
         }
         catch (err) {
-            console.log("Failed to get TVL data from defillama, trying with SDK");
+            console.log("Failed to get TVL data from defillama");
         }
-        // 2.. Try getting TVL data from SDK
+        return { totalCollateralUSD: 0, totalBorrowedUSD: 0, totalSuppliedUSD: 0 };
+    }
+    /** Gets TVL from SDK. */
+    async getSDKTvlData(params = {}) {
         try {
             const lendingPools = await this.getLendingPoolList(params);
             const results = await Promise.all(lendingPools.map(async (pool) => {
@@ -239,22 +250,50 @@ class OffchainMultichain {
                 return {
                     totalSuppliedUSD: acc.totalSuppliedUSD + val.suppliedUSD,
                     totalBorrowedUSD: acc.totalBorrowedUSD + val.borrowedUSD,
-                    totalCollateralUSD: acc.totalCollateralUSD + val.collateralUSD
+                    totalCollateralUSD: acc.totalCollateralUSD + val.collateralUSD,
                 };
             }, { totalSuppliedUSD: 0, totalBorrowedUSD: 0, totalCollateralUSD: 0 });
-            if ((tvlData.totalBorrowedUSD + tvlData.totalSuppliedUSD + tvlData.totalCollateralUSD) > 0)
-                return tvlData;
+            return tvlData;
         }
         catch (err) {
-            console.log("Failed to get TVL data natively");
+            console.log("Failed to get TVL data from SDK");
         }
         return { totalCollateralUSD: 0, totalBorrowedUSD: 0, totalSuppliedUSD: 0 };
     }
+    /**
+     * Returns {@link MultichainTvlData}. Collateral is given by the SDK, while Total Supplied
+     * and Total Borrowed is given by max of SDK/Defillama
+     */
+    async getTvlData(params = {}) {
+        const tvlData = {
+            totalSuppliedUSD: 0,
+            totalCollateralUSD: 0,
+            totalBorrowedUSD: 0
+        };
+        if (params.source === TvlDataSources.sdk)
+            return this.getSDKTvlData(params);
+        if (params.source === TvlDataSources.defillama)
+            return this.getDefillamaTvlData(params);
+        // Get both
+        const [llamaResult, sdkResult] = await Promise.allSettled([this.getDefillamaTvlData(params), this.getSDKTvlData(params)]);
+        const llamaTvl = llamaResult.status === 'fulfilled' ? llamaResult.value : tvlData;
+        const sdkTvl = sdkResult.status === 'fulfilled' ? sdkResult.value : tvlData;
+        const res0 = llamaTvl.totalCollateralUSD + llamaTvl.totalSuppliedUSD - llamaTvl.totalBorrowedUSD;
+        const res1 = sdkTvl.totalCollateralUSD + sdkTvl.totalSuppliedUSD - sdkTvl.totalBorrowedUSD;
+        // Return highest tvl of the two
+        return res0 > res1 ? llamaTvl : sdkTvl;
+    }
+    //
+    // CHARTS
+    //
     // Impermax daily TVL chart since deployment, optional to just get single chain data (~2021)
     async getImpermaxTvlChart(network) {
         const impermaxTvlChart = await this.getAPRHelper().getImpermaxTvlChart(network);
         return impermaxTvlChart;
     }
+    //
+    // ERC20 TOKENS
+    //
     async getNetworkTokens(networks) {
         const lendingPools = await this.getLendingPoolList({ networks });
         const tokenSet = new Set();

package/package.json

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