impermax-sdk 2.1.221 → 2.1.223

package/lib/offchain/lendingPool/offchainCollateral.d.ts

@@ -12,4 +12,5 @@ export default abstract class OffchainCollateral {
     abstract getSymbol(): Promise<string>;
     abstract getDecimals(): Promise<number>;
     abstract getTWAP(): Promise<number>;
+    abstract getTotalBalanceUSD(): Promise<number>;
 }

package/lib/offchain/lendingPool/offchainCollateralV2.d.ts

@@ -18,5 +18,6 @@ export default class OffchainCollateralV2 extends OffchainPoolToken implements O
     getGrowthFactor(): Promise<number>;
     getTokenPriceFast(fallback?: boolean): Promise<number>;
     getTokenPriceAccurate(): Promise<number>;
+    getTotalBalanceUSD(): Promise<number>;
     getTWAP(): Promise<number>;
 }

package/lib/offchain/lendingPool/offchainCollateralV2.js

@@ -56,6 +56,11 @@ class OffchainCollateralV2 extends offchainPoolToken_1.default {
     async getTokenPriceAccurate() {
         throw new Error("USD price conversion for collateral is deprecated");
     }
+    // TODO
+    async getTotalBalanceUSD() {
+        return 0;
+    }
+    // TODO
     async getTWAP() {
         return 1;
     }

package/lib/offchain/lendingPool/offchainCollateralV3.d.ts

@@ -15,5 +15,6 @@ export default class OffchainCollateralV3 extends OffchainCollateral {
     getDecimals(): Promise<number>;
     getUnderlyingAddress(): Promise<Address>;
     getNftlp: () => OffchainNftlp;
+    getTotalBalanceUSD(): Promise<number>;
     getTWAP(): Promise<number>;
 }

package/lib/offchain/lendingPool/offchainCollateralV3.js

@@ -41,6 +41,11 @@ class OffchainCollateralV3 extends offchainCollateral_1.default {
     //
     // Pricing
     //
+    // TODO
+    async getTotalBalanceUSD() {
+        return 0;
+    }
+    // TODO
     async getTWAP() {
         return 1;
     }

package/lib/offchain/lendingPool/offchainLendingPool.d.ts

@@ -58,6 +58,7 @@ export default abstract class OffchainLendingPool {
     getAmm(): Promise<Amms | null>;
     getFarm(): Promise<Farms | null>;
     getKinkMultiplier(): 2 | 5;
+    getTotalAPR(): Promise<number>;
     getTVL(): Promise<number>;
     isDeprecated(): Promise<boolean>;
     isBlacklisted(): Promise<boolean>;

package/lib/offchain/lendingPool/offchainLendingPool.js

@@ -121,23 +121,33 @@ class OffchainLendingPool {
             return 5;
         return 2;
     }
-    // TODO: How to get total LP $ in V3?
+    async getTotalAPR() {
+        const uniswapV2Pair = (await this.getLendingPoolData()).pair
+            .uniswapV2PairAddress;
+        // If llama fails/apr is 0 we get the uniswapAPR and stakingAPR through subgraph
+        const apr = await this.offchain
+            .getAPRHelper()
+            .getLlamaAPR(uniswapV2Pair, this.offchain.network);
+        if (apr > 0)
+            return apr;
+        // Try shadow on Sonic network
+        if (this.offchain.network === types_1.Networks.Sonic) {
+            const shadowAPR = await this.offchain
+                .getAPRHelper()
+                .getShadowAPR(uniswapV2Pair, this.offchain.network);
+            if (shadowAPR > 0)
+                return shadowAPR;
+        }
+        // TODO -> fallback for lending pools not supported by defillama
+        return 0;
+    }
     async getTVL() {
-        const [supply0USD, supply1USD] = await Promise.all([
+        const [supply0USD, supply1USD, lpUSD] = await Promise.all([
             this.getBorrowableA().getTotalBalanceUSD(),
             this.getBorrowableB().getTotalBalanceUSD(),
+            this.getCollateral().getTotalBalanceUSD(),
         ]);
-        if (supply0USD && supply1USD)
-            return supply0USD + supply1USD;
-        return 0;
-        // const [supply0USD, supply1USD, totalBalanceUSD] = await Promise.all([
-        //   this.getBorrowableA().getTotalBalanceUSD(),
-        //   this.getBorrowableB().getTotalBalanceUSD(),
-        //   this.getCollateral().getTotalBalanceUSD(),
-        // ]);
-        // if (supply0USD && supply1USD && totalBalanceUSD)
-        //   return supply0USD + supply1USD + totalBalanceUSD;
-        // return 0;
+        return supply0USD + supply1USD + lpUSD;
     }
     // Flags
     async isDeprecated() {

package/lib/offchain/lendingPool/offchainLendingPoolV2.d.ts

@@ -13,6 +13,5 @@ export default class OffchainLendingPoolV2 extends OffchainLendingPool {
     protected getNewCollateralObject(): OffchainCollateralV2;
     protected getNewBorrowableObject(borrowable: Borrowable): OffchainBorrowableV2;
     getNewAccountLendingPoolObject(account: OffchainAccount): OffchainAccountLendingPoolV2;
-    getTVL(): Promise<number>;
     getUniswapV2PairAddress(): Promise<Address>;
 }

package/lib/offchain/lendingPool/offchainLendingPoolV2.js

@@ -18,16 +18,6 @@ class OffchainLendingPoolV2 extends offchainLendingPool_1.default {
     getNewAccountLendingPoolObject(account) {
         return new offchainAccountLendingPoolV2_1.default(account, this);
     }
-    async getTVL() {
-        const [supply0USD, supply1USD, lpUSD] = await Promise.all([
-            this.getBorrowableA().getTotalBalanceUSD(),
-            this.getBorrowableB().getTotalBalanceUSD(),
-            this.collateral.getTotalBalanceUSD() // TODO
-        ]);
-        if (supply0USD && supply1USD && lpUSD)
-            return supply0USD + supply1USD + lpUSD;
-        return 0;
-    }
     async getUniswapV2PairAddress() {
         const lendingPoolData = await this.getLendingPoolData();
         return lendingPoolData.pair.uniswapV2PairAddress;

package/lib/offchain/offchainPoolToken.d.ts

@@ -15,7 +15,6 @@ export default abstract class OffchainPoolToken {
     getUnderlyingAddress(): Promise<Address>;
     getTotalBalance(): Promise<number>;
     getTotalBalanceUSD(): Promise<number>;
-    calculateCollateralPrice(reserve0: number, reserve1: number, totalSupply: number, price0: number, price1: number): number;
     getTokenPriceFast(fallback?: boolean): Promise<number>;
     abstract getTokenPriceAccurate(): Promise<number>;
 }

package/lib/offchain/offchainPoolToken.js

@@ -71,19 +71,6 @@ class OffchainPoolToken {
         const tokenPrice = await this.getTokenPriceFast();
         return totalBalance * tokenPrice;
     }
-    // Calculate collateral price -> returns the price of the collateral, not necessarily of the underlying LP
-    // TODO refactor?
-    calculateCollateralPrice(reserve0, reserve1, totalSupply, price0, price1) {
-        if (totalSupply === 0) {
-            console.error("Warning: totalSupply is 0");
-            return 0;
-        }
-        const reserve0USD = reserve0 * price0;
-        const reserve1USD = reserve1 * price1;
-        // adjust reserves taking the latest price passed as parameters
-        const adjustedReserveUSD = Math.sqrt(reserve0USD * reserve1USD) * 2;
-        return adjustedReserveUSD / totalSupply;
-    }
     // Token price getters
     async getTokenPriceFast(fallback = true) {
         if (fallback) {

package/package.json

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