impermax-sdk 2.1.358 → 2.1.360

package/lib/offchain/lendingPool/nftlp/offchainNftlpUniswapV3.js

@@ -201,10 +201,10 @@ class OffchainNftlpUniswapV3 extends offchainNftlp_1.default {
         }
         return bestRate;
     }
-    // calculate the pair APR assuming a +-15% price range
+    // calculate the pair APR assuming a +-8% price range
     async getTotalAPR() {
         const fullRangeAPR = await this.getBestFullRangeRate() * utils_1.SECONDS_IN_YEAR;
-        return fullRangeAPR * (0, uniswapV3General_1.uniV3ConcentrationFactor)(1 / 1.15, 1.15);
+        return fullRangeAPR * (0, uniswapV3General_1.uniV3ConcentrationFactor)(1 / 1.08, 1.08);
     }
 }
 exports.default = OffchainNftlpUniswapV3;

package/lib/offchain/offchainAPRHelper.js

@@ -107,23 +107,70 @@ class OffchainAPRHelper {
     // Initializes all our chain tvl and borrows from llama
     async initializeTvls() {
         try {
-            const response = await fetch("https://api.llama.fi/protocol/impermax-finance").then((i) => i.json());
-            // Simple TVL of all chains
-            const currentChainTvls = response.currentChainTvls;
-            // For charts of our tvl and tvl by chains
-            const chainTvlCharts = response.chainTvls;
-            const protocolTvlChart = response.tvl;
-            // Get the chain tvls
-            this.chainTvls = Object.entries(currentChainTvls).reduce((acc, [chain, tvl]) => {
+            const [v2Response, v3Response, impermaxAll] = await Promise.all([
+                fetch("https://api.llama.fi/protocol/impermax-v2").then(i => i.json()),
+                fetch("https://api.llama.fi/protocol/impermax-v3").then(i => i.json()),
+                fetch("https://api.llama.fi/protocol/impermax-finance").then(i => i.json())
+            ]);
+            // Combine chain TVLs from both versions
+            const v2ChainTvls = v2Response.currentChainTvls || {};
+            const v3ChainTvls = v3Response.currentChainTvls || {};
+            // Initialize with v2 chain TVLs
+            this.chainTvls = Object.entries(v2ChainTvls).reduce((acc, [chain, tvl]) => {
                 acc[chain.toLowerCase()] = tvl;
                 return acc;
             }, {});
+            // Add or update with v3 chain TVLs
+            Object.entries(v3ChainTvls).forEach(([chain, tvl]) => {
+                this.chainTvls[chain.toLowerCase()] = (this.chainTvls[chain.toLowerCase()] || 0) + Number(tvl);
+            });
+            // For charts of our tvl and tvl by chains
+            const chainTvlCharts = impermaxAll.chainTvls;
             // Get the chain tvls day data to build charts
             this.chainTvlCharts = Object.entries(chainTvlCharts).reduce((acc, [chain, dayData]) => {
                 acc[chain.toLowerCase()] = dayData.tvl;
                 return acc;
             }, {});
-            this.protocolTvlChart = protocolTvlChart;
+            const normalizedTvlByDate = new Map();
+            // Process v2 data with normalized dates
+            v2Response.tvl.forEach(item => {
+                // Convert timestamp to milliseconds and create Date
+                const date = new Date(item.date * 1000);
+                // Normalize to start of day
+                date.setHours(0, 0, 0, 0);
+                // Convert back to seconds for consistency
+                const normalizedTimestamp = Math.floor(date.getTime() / 1000);
+                normalizedTvlByDate.set(normalizedTimestamp, {
+                    date: normalizedTimestamp,
+                    totalLiquidityUSD: item.totalLiquidityUSD
+                });
+            });
+            // Process v3 data and add to existing entries
+            v3Response.tvl.forEach(item => {
+                if (Number(item.date) === 1743552000)
+                    return;
+                // Convert timestamp to milliseconds and create Date
+                const date = new Date(item.date * 1000);
+                // Normalize to start of day
+                date.setHours(0, 0, 0, 0);
+                // Convert back to seconds for consistency
+                const normalizedTimestamp = Math.floor(date.getTime() / 1000);
+                if (normalizedTvlByDate.has(normalizedTimestamp)) {
+                    // Add v3 TVL to existing v2 TVL for this date
+                    const existingEntry = normalizedTvlByDate.get(normalizedTimestamp);
+                    existingEntry.totalLiquidityUSD += item.totalLiquidityUSD;
+                }
+                else {
+                    // This date only exists in v3, add it as new
+                    normalizedTvlByDate.set(normalizedTimestamp, {
+                        date: normalizedTimestamp,
+                        totalLiquidityUSD: item.totalLiquidityUSD
+                    });
+                }
+            });
+            // Convert map back to sorted array
+            this.protocolTvlChart = Array.from(normalizedTvlByDate.values())
+                .sort((a, b) => a.date - b.date);
         }
         catch (err) {
             console.warn("The llamas TVL down?");

package/package.json

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