impermax-sdk 2.1.76 → 2.1.77

package/lib/offchain/account/lendingPool/offchainAccountBorrowable.d.ts

@@ -11,4 +11,6 @@ export default abstract class OffchainAccountBorrowable extends OffchainAccountP
     getPoolToken: () => OffchainBorrowable;
     private getSupplyPosition;
     getAmount(): Promise<number>;
+    getEarnings(): Promise<number>;
+    getEarningsUSD(): Promise<number>;
 }

package/lib/offchain/account/lendingPool/offchainAccountBorrowable.js

@@ -30,16 +30,39 @@ class OffchainAccountBorrowable extends offchainAccountPoolToken_1.default {
             return lendingPoolPosition[`borrowable${this.borrowable}`];
         });
     }
-    // TODO update to support real time exchange rate
     getAmount() {
         return __awaiter(this, void 0, void 0, function* () {
             const supplyPosition = yield this.getSupplyPosition();
             if (!supplyPosition)
                 return 0;
-            const exchangeRate = yield this.poolToken.getExchangeRate();
+            const exchangeRate = yield this.poolToken.getCurrentExchangeRate();
             const supplyBalance = parseFloat(supplyPosition.balance);
             return supplyBalance * exchangeRate;
         });
     }
+    // WARN: Not all networks support cumulativeEarnings for now, see the `userQuery` in
+    //       queries/apis/thegraph/index.ts. atm only available on Blast
+    getEarnings() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const supplyPosition = yield this.getSupplyPosition();
+            if (!supplyPosition)
+                return 0;
+            const exchangeRate = yield this.poolToken.getCurrentExchangeRate();
+            if (!supplyPosition.cumulativeEarnings)
+                return 0;
+            const cumulativeEarnings = parseFloat(supplyPosition.cumulativeEarnings);
+            const lastExchangeRate = parseFloat(supplyPosition.lastExchangeRate);
+            const tokenBalance = parseFloat(supplyPosition.balance);
+            const newEarnings = (exchangeRate - lastExchangeRate) * tokenBalance;
+            return cumulativeEarnings + newEarnings;
+        });
+    }
+    getEarningsUSD() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tokenPrice = yield this.poolToken.getTokenPriceAccurate();
+            const earnings = yield this.getEarnings();
+            return earnings * tokenPrice;
+        });
+    }
 }
 exports.default = OffchainAccountBorrowable;

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

@@ -1,7 +1,7 @@
 import { BorrowablePastData, PoolTokenData } from "../offchainTypes";
-import { Address, Borrowable } from '../../config/types';
-import OffchainPoolToken from '../offchainPoolToken';
-import OffchainLendingPool from './offchainLendingPool';
+import { Address, Borrowable } from "../../config/types";
+import OffchainPoolToken from "../offchainPoolToken";
+import OffchainLendingPool from "./offchainLendingPool";
 export default class OffchainBorrowable extends OffchainPoolToken {
     protected readonly lendingPool: OffchainLendingPool;
     protected readonly borrowable: Borrowable;
@@ -56,4 +56,6 @@ export default class OffchainBorrowable extends OffchainPoolToken {
     getAverage7dSupplyAPR(): Promise<number>;
     getTokenPriceFast(fallback?: boolean): Promise<number>;
     getTokenPriceAccurate(): Promise<number>;
+    private getAccrueFactor;
+    getCurrentExchangeRate(): Promise<number>;
 }

package/lib/offchain/lendingPool/offchainBorrowable.js

@@ -48,7 +48,7 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let borrowRate = 0;
             const KINK_MULTIPLIER = this.lendingPool.getKinkMultiplier();
-            const KINK_BORROW_RATE_MAX = 792.7448 / 1e9; // 2500% per year 
+            const KINK_BORROW_RATE_MAX = 792.7448 / 1e9; // 2500% per year
             const KINK_BORROW_RATE_MIN = 0.31709792 / 1e9; // 1% per year
             const [_kinkUtilizationRate, _adjustSpeed, _borrowRate, _kinkBorrowRate, _rateUpdateTimestamp,] = yield Promise.all([
                 this.getPoolTokenParamFloat("kinkUtilizationRate"),
@@ -64,11 +64,15 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
             if (timeElapsed > 0) {
                 let adjustFactor = 0;
                 if (_borrowRate < _kinkBorrowRate) {
-                    const tmp = (_kinkBorrowRate - _borrowRate) / _kinkBorrowRate * _adjustSpeed * timeElapsed;
+                    const tmp = ((_kinkBorrowRate - _borrowRate) / _kinkBorrowRate) *
+                        _adjustSpeed *
+                        timeElapsed;
                     adjustFactor = tmp > 1 ? 0 : 1 - tmp;
                 }
                 else {
-                    const tmp = (_borrowRate - _kinkBorrowRate) / _kinkBorrowRate * _adjustSpeed * timeElapsed;
+                    const tmp = ((_borrowRate - _kinkBorrowRate) / _kinkBorrowRate) *
+                        _adjustSpeed *
+                        timeElapsed;
                     adjustFactor = 1 + tmp;
                 }
                 kinkBorrowRate = _kinkBorrowRate * adjustFactor;
@@ -79,11 +83,10 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
             }
             // Simulate accrual
             const { totalBalance, totalBorrows } = yield this._accrueInterest();
-            ;
             const _actualBalance = totalBalance + totalBorrows;
             const _utilizationRate = _actualBalance === 0 ? 0 : totalBorrows / _actualBalance;
             if (_utilizationRate <= _kinkUtilizationRate) {
-                borrowRate = kinkBorrowRate * _utilizationRate / _kinkUtilizationRate;
+                borrowRate = (kinkBorrowRate * _utilizationRate) / _kinkUtilizationRate;
             }
             else {
                 const overUtil = (_utilizationRate - _kinkUtilizationRate) / (1 - _kinkUtilizationRate);
@@ -186,9 +189,9 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
             const { kinkBorrowRate: kinkBR } = yield this._calculateBorrowRate();
             const kinkUR = yield this.getKinkUtilizationRate();
             if (UR < kinkUR)
-                return UR / kinkUR * kinkBR;
+                return (UR / kinkUR) * kinkBR;
             const kinkMultiplier = this.lendingPool.getKinkMultiplier();
-            return ((UR - kinkUR) / (1 - kinkUR) * (kinkMultiplier - 1) + 1) * kinkBR;
+            return (((UR - kinkUR) / (1 - kinkUR)) * (kinkMultiplier - 1) + 1) * kinkBR;
         });
     }
     getNextBorrowAPR(borrowAmount) {
@@ -244,9 +247,12 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
             const kinkUR = yield this.getKinkUtilizationRate();
             const reserveFactor = yield this.getReserveFactor();
             if (UR < kinkUR)
-                return UR / kinkUR * kinkBR * UR * (1 - reserveFactor);
+                return (UR / kinkUR) * kinkBR * UR * (1 - reserveFactor);
             const kinkMultiplier = this.lendingPool.getKinkMultiplier();
-            return ((UR - kinkUR) / (1 - kinkUR) * (kinkMultiplier - 1) + 1) * kinkBR * UR * (1 - reserveFactor);
+            return ((((UR - kinkUR) / (1 - kinkUR)) * (kinkMultiplier - 1) + 1) *
+                kinkBR *
+                UR *
+                (1 - reserveFactor));
         });
     }
     getNextSupplyAPR(supplyAmount) {
@@ -258,7 +264,7 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
     // Reward Speed
     getFarmingRewardsRate() {
         return __awaiter(this, void 0, void 0, function* () {
-            const poolTokenData = yield this.getPoolTokenData();
+            const poolTokenData = (yield this.getPoolTokenData());
             const rewards = poolTokenData.rewards;
             if (rewards && rewards.length > 0)
                 return rewards;
@@ -270,15 +276,17 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
             const epochAmount = parseFloat(farmingPoolData.epochAmount);
             const epochBegin = parseInt(farmingPoolData.epochBegin);
             const epochEnd = epochBegin + segmentLength;
-            const timestamp = (new Date()).getTime() / 1000;
+            const timestamp = new Date().getTime() / 1000;
             if (timestamp - FINISH_DELAY > epochEnd) {
                 // How to manage better this case? Maybe check shares on distributor
                 return [];
             }
-            return [{
+            return [
+                {
                     rewardToken: imxes_1.IMX[this.getOffchain().network],
-                    rewardRate: epochAmount / segmentLength
-                }];
+                    rewardRate: epochAmount / segmentLength,
+                },
+            ];
         });
     }
     // Farming
@@ -298,19 +306,37 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
                 return [];
             const rewards = [];
             for (const reward of farmingRewards) {
-                const rewardPrice = yield this.getOffchain().getPriceHelper().getDebankTokenPrice(this.getOffchain().network, reward.rewardToken);
+                const rewardPrice = yield this.getOffchain()
+                    .getPriceHelper()
+                    .getDebankTokenPrice(this.getOffchain().network, reward.rewardToken);
                 rewards.push({
                     APR: (0, utils_1.toAPR)((rewardPrice * reward.rewardRate) / totalBorrowedUSD),
-                    symbol: reward.rewardToken == "0x98878b06940ae243284ca214f92bb71a2b032b8a" ? "WMOVR" :
-                        reward.rewardToken == "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270" ? "WMATIC" :
-                            reward.rewardToken == "0x6659a9c5cd313974343e30b4fdffd95bd4b4dcd2" ? "IMX" :
-                                reward.rewardToken == "0x7b35ce522cb72e4077baeb96cb923a5529764a00" ? "IMX" :
-                                    reward.rewardToken == "0x60bb3d364b765c497c8ce50ae0ae3f0882c5bd05" ? "IMX" :
-                                        reward.rewardToken == "0x9c67ee39e3c4954396b9142010653f17257dd39c" ? "IMX" :
-                                            reward.rewardToken == "0xea6887e4a9cda1b77e70129e5fba830cdb5cddef" ? "IMX" :
-                                                reward.rewardToken == "0x900f1Ec5819FA087d368877cD03B265Bf1802667" ? "IMX" :
-                                                    reward.rewardToken == "0xea38f1ccf77bf43f352636241b05dd8f6f5f52b2" ? "IMX" :
-                                                        "IBEX",
+                    symbol: reward.rewardToken == "0x98878b06940ae243284ca214f92bb71a2b032b8a"
+                        ? "WMOVR"
+                        : reward.rewardToken == "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270"
+                            ? "WMATIC"
+                            : reward.rewardToken ==
+                                "0x6659a9c5cd313974343e30b4fdffd95bd4b4dcd2"
+                                ? "IMX"
+                                : reward.rewardToken ==
+                                    "0x7b35ce522cb72e4077baeb96cb923a5529764a00"
+                                    ? "IMX"
+                                    : reward.rewardToken ==
+                                        "0x60bb3d364b765c497c8ce50ae0ae3f0882c5bd05"
+                                        ? "IMX"
+                                        : reward.rewardToken ==
+                                            "0x9c67ee39e3c4954396b9142010653f17257dd39c"
+                                            ? "IMX"
+                                            : reward.rewardToken ==
+                                                "0xea6887e4a9cda1b77e70129e5fba830cdb5cddef"
+                                                ? "IMX"
+                                                : reward.rewardToken ==
+                                                    "0x900f1Ec5819FA087d368877cD03B265Bf1802667"
+                                                    ? "IMX"
+                                                    : reward.rewardToken ==
+                                                        "0xea38f1ccf77bf43f352636241b05dd8f6f5f52b2"
+                                                        ? "IMX"
+                                                        : "IBEX",
                 });
             }
             return rewards;
@@ -357,7 +383,8 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
                 const accrualTimestampNow = yield this.getAccrualTimestamp();
                 const borrowIndexNow = yield this.getBorrowIndex();
                 if (accrualTimestampNow > accrualTimestampPast) {
-                    const borrowRate = (borrowIndexNow / borrowIndexPast - 1) / (accrualTimestampNow - accrualTimestampPast);
+                    const borrowRate = (borrowIndexNow / borrowIndexPast - 1) /
+                        (accrualTimestampNow - accrualTimestampPast);
                     return borrowRate * 3600 * 24 * 365;
                 }
             }
@@ -385,7 +412,8 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
                 const accrualTimestampNow = yield this.getAccrualTimestamp();
                 const exchangeRateNow = yield this.getExchangeRate();
                 if (accrualTimestampNow > accrualTimestampPast) {
-                    const supplyRate = (exchangeRateNow / exchangeRatePast - 1) / (accrualTimestampNow - accrualTimestampPast);
+                    const supplyRate = (exchangeRateNow / exchangeRatePast - 1) /
+                        (accrualTimestampNow - accrualTimestampPast);
                     return supplyRate * 3600 * 24 * 365;
                 }
             }
@@ -411,7 +439,9 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
         });
         return __awaiter(this, void 0, void 0, function* () {
             let tokenAddress = yield this.getUnderlyingAddress();
-            let tokenPrices = yield this.getOffchain().getPriceHelper().getSubgraphTokensPrice(this.getOffchain().network);
+            let tokenPrices = yield this.getOffchain()
+                .getPriceHelper()
+                .getSubgraphTokensPrice(this.getOffchain().network);
             let tokenPrice = tokenPrices[tokenAddress];
             if (tokenPrice !== undefined && tokenPrice > 0)
                 return tokenPrice;
@@ -421,7 +451,24 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
     getTokenPriceAccurate() {
         return __awaiter(this, void 0, void 0, function* () {
             let tokenAddress = yield this.getUnderlyingAddress();
-            return this.getOffchain().getPriceHelper().getDebankTokenPrice(this.getOffchain().network, tokenAddress);
+            return this.getOffchain()
+                .getPriceHelper()
+                .getDebankTokenPrice(this.getOffchain().network, tokenAddress);
+        });
+    }
+    getAccrueFactor() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const now = Date.now() / 1000;
+            const timeElapsed = now - (yield this.getAccrualTimestamp());
+            const supplyRate = yield this.getSupplyRate();
+            return 1 + timeElapsed * supplyRate;
+        });
+    }
+    getCurrentExchangeRate() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const lastExchangeRate = yield this.getExchangeRate();
+            const accrueFactor = yield this.getAccrueFactor();
+            return lastExchangeRate * accrueFactor;
         });
     }
 }

package/lib/offchain/offchainInitializer.js

@@ -631,8 +631,8 @@ function initializeUserData(account) {
             for (const borrowPositions of rawUserData.borrowPositions) {
                 const uniswapV2PairAddress = borrowPositions.borrowable.lendingPool.id;
                 const underlyingAddress = borrowPositions.borrowable.underlying.id;
-                const borrowableB = (yield this.getLendingPool(factory, uniswapV2PairAddress)).getBorrowableB();
-                const addressA = yield borrowableB.getUnderlyingAddress();
+                const borrowableA = (yield this.getLendingPool(factory, uniswapV2PairAddress)).getBorrowableA();
+                const addressA = yield borrowableA.getUnderlyingAddress();
                 const poolTokenType = underlyingAddress === addressA
                     ? types_1.PoolTokenType.BorrowableA
                     : types_1.PoolTokenType.BorrowableB;

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

@@ -133,12 +133,14 @@ class TheGraphQueryBuilder {
       }
     }`;
     }
+    // TODO: Fix earnings once all networks support
     userQuery(account, network, factory) {
         if (factory === types_1.Factory.V3)
             return this.userQueryV3(account, network, factory);
         // Shh
         network;
         factory;
+        const earnings = network === types_1.Networks.Blast && factory === types_1.Factory.SOLV2 ? "cumulativeEarnings lastExchangeRate" : "";
         return (0, graphql_tag_1.default) `{
       user(id: "${account.toLowerCase()}") {
         collateralPositions(first:1000) {
@@ -151,6 +153,7 @@ class TheGraphQueryBuilder {
         }
         supplyPositions(first:1000) {
           balance
+          ${earnings}
           borrowable {
             underlying {
               id

package/package.json

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