impermax-sdk 2.1.214 → 2.1.215

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

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

package/lib/offchain/lendingPool/offchainCollateralV2.js

@@ -45,6 +45,11 @@ class OffchainCollateralV2 extends offchainPoolToken_1.default {
         const reserve1 = parseFloat(lendingPoolData.pair.reserve1);
         const totalSupply = parseFloat(lendingPoolData.pair.totalSupply);
         const exchangeRate = await this.getExchangeRate();
+        console.log("offchain exchangeRate", exchangeRate);
+        console.log("offchain reserve0", reserve0);
+        console.log("offchain reserve1", reserve1);
+        console.log("offchain totalSupply", totalSupply);
+        console.log("offchain k", Math.sqrt(reserve0 * reserve1) / totalSupply);
         return Math.sqrt(reserve0 * reserve1) / totalSupply * exchangeRate;
     }
     //

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

@@ -31,9 +31,9 @@ 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();
+        console.log("Onchain `getTokens`: %s", await this.getTokens());
+        console.log("Offchain `getGrowthFactor`: %s", await this.getCollateral().getGrowthFactor());
+        return await this.getTokens() * await this.getCollateral().getGrowthFactor();
     }
     // Notice: createNewPositionObject is not needed for V2
     async createPositionObject(lockStateChange = false) {

package/lib/onchain/account/onchainAccountPoolToken.d.ts

@@ -6,7 +6,8 @@ export default abstract class OnchainAccountPoolToken {
     protected poolToken: OnchainPoolToken;
     protected cache: {
         availableBalance?: Promise<number>;
-        deposited?: Promise<number>;
+        tokens?: Promise<number>;
+        amount?: Promise<number>;
     };
     getPoolToken: () => OnchainPoolToken;
     abstract getAccount(): OnchainAccount;
@@ -23,8 +24,11 @@ export default abstract class OnchainAccountPoolToken {
     private initializeAvailableBalance;
     getAvailableBalance(): Promise<number>;
     getAvailableBalanceUSD(): Promise<number>;
-    private initializeDeposited;
-    getDeposited(): Promise<number>;
+    private initializeTokens;
+    getTokens(): Promise<number>;
+    private initializeAmount;
+    getAmount(): Promise<number>;
+    getDeposited: () => Promise<number>;
     getDepositedUSD(): Promise<number>;
     getMaxWithdrawable(): Promise<number>;
 }

package/lib/onchain/account/onchainAccountPoolToken.js

@@ -13,6 +13,7 @@ class OnchainAccountPoolToken {
         this.getLiquidityBuffer = () => this.getAccount().getOnchain().liquidityBuffer;
         this.getUiMargin = () => this.getAccount().getOnchain().uiMargin;
         this.getTokenPriceAccurate = async () => (await this.poolToken.getOffchainPoolToken()).getTokenPriceAccurate();
+        this.getDeposited = this.getAmount;
     }
     cleanCache() {
         this.cache = {};
@@ -36,17 +37,27 @@ class OnchainAccountPoolToken {
         const tokenPrice = await this.getTokenPriceAccurate();
         return availableBalance * tokenPrice;
     }
-    // Deposited
-    async initializeDeposited() {
+    // Tokens
+    async initializeTokens() {
         const poolToken = await this.poolToken.getPoolToken();
-        const exchangeRate = await this.poolToken.getExchangeRate();
         const balance = await poolToken.methods.balanceOf(this.getAccountAddress()).call();
-        return (await this.poolToken.normalize(balance)) * exchangeRate;
+        return (await this.poolToken.normalize(balance));
+    }
+    async getTokens() {
+        if (!this.cache.tokens)
+            this.cache.tokens = this.initializeTokens();
+        return this.cache.tokens;
+    }
+    // Deposited
+    async initializeAmount() {
+        const exchangeRate = await this.poolToken.getExchangeRate();
+        const tokens = await this.getTokens();
+        return (await this.poolToken.normalize(tokens)) * exchangeRate;
     }
-    async getDeposited() {
-        if (!this.cache.deposited)
-            this.cache.deposited = this.initializeDeposited();
-        return this.cache.deposited;
+    async getAmount() {
+        if (!this.cache.amount)
+            this.cache.amount = this.initializeAmount();
+        return this.cache.amount;
     }
     async getDepositedUSD() {
         const deposited = await this.getDeposited();

package/lib/onchain/impermaxFactory/lendingPool/onchainCollateralV2.js

@@ -37,9 +37,13 @@ class OnchainCollateralV2 extends onchainPoolToken_1.default {
     async getGrowthFactor() {
         const [reserve0, reserve1] = await this.getLendingPool().getReserves();
         const totalSupply = await this.getLendingPool().getLPTotalSupply();
-        const stakedLPExchangeRate = await this.getLendingPool().getStakedLPExchangeRate();
         const exchangeRate = await this.getExchangeRate();
-        return Math.sqrt(reserve0 * reserve1) / totalSupply * stakedLPExchangeRate * exchangeRate;
+        console.log("onchain exchangeRate", exchangeRate);
+        console.log("onchain reserve0", reserve0);
+        console.log("onchain reserve1", reserve1);
+        console.log("onchain totalSupply", totalSupply);
+        console.log("onchain k", Math.sqrt(reserve0 * reserve1) / totalSupply);
+        return Math.sqrt(reserve0 * reserve1) / totalSupply * exchangeRate;
     }
 }
 exports.default = OnchainCollateralV2;

package/package.json

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