impermax-sdk 2.1.212 → 2.1.214

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

@@ -28,6 +28,7 @@ class OffchainAccountCollateralV2 extends offchainAccountPoolToken_1.default {
     }
     async getLiquidity() {
         // todo check if growth factor works
+        console.log("Offchain `getAmount`: %s", await this.getAmount());
         return await this.getAmount() * await this.getCollateral().getGrowthFactor();
     }
     // Notice: createNewPositionObject is not needed for V2

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

@@ -22,14 +22,14 @@ export default class OffchainBorrowable extends OffchainPoolToken {
     getAccrualTimestamp(): Promise<number>;
     getTotalBorrows(): Promise<number>;
     getTotalBorrowsUSD(): Promise<number>;
-    getBorrowRate(): Promise<number>;
+    getBorrowRate(useStored?: boolean): Promise<number>;
     getBorrowAPR(): Promise<number>;
     getNextBorrowRate(borrowAmount: number): Promise<number>;
     getNextBorrowAPR(borrowAmount: number): Promise<number>;
     getSupply(): Promise<number>;
     getSupplyUSD(): Promise<number>;
     getUtilizationRate(): Promise<number>;
-    getSupplyRate(): Promise<number>;
+    getSupplyRate(useStored?: boolean): Promise<number>;
     getSupplyAPR(): Promise<number>;
     getNextSupplyRate(supplyAmount: number): Promise<number>;
     getNextSupplyAPR(supplyAmount: number): Promise<number>;

package/lib/offchain/lendingPool/offchainBorrowable.js

@@ -141,7 +141,11 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
         return totalBorrows * tokenPrice;
     }
     // Borrow rate
-    async getBorrowRate() {
+    async getBorrowRate(useStored) {
+        // Use stored is mainly used for onchain and `accrueFactor`. 
+        // Offchain already simulates accruals.
+        if (useStored)
+            return await this.getPoolTokenParamFloat("borrowRate");
         const { borrowRate } = await this._calculateBorrowRate();
         return borrowRate;
     }
@@ -182,8 +186,8 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
         return totalBorrows / (totalBalance + totalBorrows);
     }
     // Supply Rate
-    async getSupplyRate() {
-        const borrowRate = await this.getBorrowRate();
+    async getSupplyRate(useStored) {
+        const borrowRate = await this.getBorrowRate(useStored);
         const utilizationRate = await this.getUtilizationRate();
         const reserveFactor = await this.getReserveFactor();
         return borrowRate * utilizationRate * (1 - reserveFactor);
@@ -376,7 +380,7 @@ class OffchainBorrowable extends offchainPoolToken_1.default {
     async getAccrueFactor() {
         const now = Date.now() / 1000;
         const timeElapsed = now - await this.getAccrualTimestamp();
-        const supplyRate = await this.getSupplyRate();
+        const supplyRate = await this.getSupplyRate(true);
         return 1 + timeElapsed * supplyRate;
     }
     async getCurrentExchangeRate() {

package/lib/onchain/account/lendingPool/onchainAccountBorrowable.js

@@ -14,9 +14,11 @@ class OnchainAccountBorrowable extends onchainAccountPoolToken_1.default {
         this.getInteractionsBorrowable = this.getInteractionsPoolToken;
         this.getOffchainAccountBorrowable = this.getOffchainAccountPoolToken;
         // Shortcuts
+        // TODO: Should shortcuts be using stored param floats from subgraphs or updated one?.
+        //       See note in `getBorrowRate` function in `offchainBorrowable.ts`
         this.getBorrowableType = () => this.poolToken.getBorrowableType();
         this.getSupplyAPR = async () => (await this.poolToken.getOffchainPoolToken()).getSupplyAPR();
-        this.getBorrowRate = async () => (await this.poolToken.getOffchainPoolToken()).getBorrowRate();
+        this.getBorrowRate = async () => (await this.poolToken.getOffchainPoolToken()).getBorrowRate(true);
         this.getAccrualTimestamp = async () => (await this.poolToken.getOffchainPoolToken()).getAccrualTimestamp();
         this.lendingPool = lendingPool;
         this.poolToken = lendingPool.getLendingPool().getBorrowable(borrowable);

package/lib/onchain/account/lendingPool/onchainAccountBorrowableV2.js

@@ -16,7 +16,7 @@ class OnchainAccountBorrowableV2 extends onchainAccountBorrowable_1.default {
     async initializeBorrowed() {
         const borrowable = await this.poolToken.getPoolToken();
         const balance = await borrowable.methods.borrowBalance(this.getAccountAddress()).call();
-        const storedAmount = await await this.poolToken.normalize(balance);
+        const storedAmount = await this.poolToken.normalize(balance);
         const accrualTimestamp = await this.getAccrualTimestamp();
         const borrowRate = await this.getBorrowRate();
         return storedAmount * (1 + (Date.now() / 1000 - accrualTimestamp) * borrowRate);

package/lib/onchain/account/lendingPool/onchainAccountCollateralV2.js

@@ -31,6 +31,7 @@ class OnchainAccountCollateralV2 extends onchainAccountPoolToken_1.default {
         this.collateralCache = {};
     }
     async getLiquidity() {
+        console.log("Onchain `getLiquidity`: %s", await this.getDeposited());
         // todo check if growth factor works
         return await this.getDeposited() * await this.getCollateral().getGrowthFactor();
     }

package/package.json

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