impermax-sdk 2.1.569 → 2.1.571

package/lib/config/whitelist.js

@@ -117,6 +117,8 @@ exports.WHITELISTED_PAIRS = {
             "0xFd6b42A3da0e755d647D1eBF522E7D4368D7fEf7",
             "0xB8e831D4eb4Ce93ffca9Ff4A8fe2c3f9bF99628A",
             "0xb5E2500f93Bc2DD3163E191EBc6F3B2f5B1E8b7f",
+            "0xc612250083ad9a3b1b07616f7832d0ba11cef227",
+            "0xe2a738197977c3135796ae45b3b847f1126489e0",
             // Scale
             "0x4Cafce8b0Ca0Ba9d3490Ce9b67048139f698a5f8",
             "0x965c3f8Dc3aa446b268aB3Bca4d7E82b788FfE96",

package/lib/offchain/account/lendingPool/nftlp/offchainAccountNftlpGenericCL.d.ts

@@ -25,6 +25,6 @@ export default abstract class OffchainAccountNftlpGenericCL extends OffchainAcco
     getUnclaimedFees(tokenId: number): Promise<FeeAmounts>;
     getCumulativeDeposit0(tokenId: number): Promise<number>;
     getCumulativeDeposit1(tokenId: number): Promise<number>;
-    createPositionObject(tokenId: number): Promise<GenericCLPosition>;
-    getPositionObject(tokenId: number): Promise<GenericCLPosition>;
+    createPositionObject(tokenId: number, onchainPrice?: number): Promise<GenericCLPosition>;
+    getPositionObject(tokenId: number, onchainPrice?: number): Promise<GenericCLPosition>;
 }

package/lib/offchain/account/lendingPool/nftlp/offchainAccountNftlpGenericCL.js

@@ -67,7 +67,7 @@ class OffchainAccountNftlpGenericCL extends offchainAccountNftlp_1.default {
         const positionData = await this.getPositionData(tokenId);
         return parseFloat(positionData.cumulativeDeposit1);
     }
-    async createPositionObject(tokenId) {
+    async createPositionObject(tokenId, onchainPrice) {
         const unclaimedFees = await this.getUnclaimedFees(tokenId);
         return new cl_1.default({
             liquidity: await this.getLiquidity(tokenId),
@@ -75,7 +75,7 @@ class OffchainAccountNftlpGenericCL extends offchainAccountNftlp_1.default {
             unclaimedFeesY: unclaimedFees.amountY,
             debtX: await this.getLendingPool().getBorrowableA().getBorrowedAmount(tokenId),
             debtY: await this.getLendingPool().getBorrowableB().getBorrowedAmount(tokenId),
-            marketPrice: await this.getNftlp().getMarketPrice(),
+            marketPrice: onchainPrice ?? await this.getNftlp().getMarketPrice(),
             oraclePrice: await this.getNftlp().getOraclePrice(),
             priceA: await this.getPriceA(tokenId),
             priceB: await this.getPriceB(tokenId),
@@ -90,11 +90,11 @@ class OffchainAccountNftlpGenericCL extends offchainAccountNftlp_1.default {
             cumulativeBorrowY: await this.getLendingPool().getBorrowableB().getCumulativeBorrows(tokenId),
         });
     }
-    async getPositionObject(tokenId) {
+    async getPositionObject(tokenId, onchainPrice) {
         if (!this.cache.positionsObject)
             this.cache.positionsObject = {};
         if (!this.cache.positionsObject[tokenId])
-            this.cache.positionsObject[tokenId] = this.createPositionObject(tokenId);
+            this.cache.positionsObject[tokenId] = this.createPositionObject(tokenId, onchainPrice);
         return this.cache.positionsObject[tokenId];
     }
 }

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

@@ -20,6 +20,7 @@ export default abstract class OnchainAccountPoolToken {
     getLiquidityBuffer: () => number;
     getUiMargin: () => number;
     getTokenPriceAccurate: () => Promise<number>;
+    getMulticall: () => import("../onchainMulticall").default;
     private initializeAvailableBalance;
     getAvailableBalance(): Promise<number>;
     getAvailableBalanceUSD(): 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.getMulticall = () => this.getAccount().getOnchain().multicall;
         this.getDeposited = this.getAmount;
     }
     cleanCache() {
@@ -22,9 +23,9 @@ class OnchainAccountPoolToken {
     async initializeAvailableBalance() {
         const token = await this.poolToken.getToken();
         if (token._address.toLowerCase() == weths_1.WETH[this.getNetwork()].toLowerCase()) {
-            return (await this.getEth().getBalance(this.getAccountAddress())) / 1e18;
+            return (await this.getMulticall().call(this.getMulticall().getEthBalance(this.getAccountAddress()))) / 1e18;
         }
-        const balance = await token.methods.balanceOf(this.getAccountAddress()).call();
+        const balance = await this.getMulticall().call(token.methods.balanceOf(this.getAccountAddress()));
         return (await this.poolToken.normalize(balance));
     }
     async getAvailableBalance() {
@@ -40,7 +41,7 @@ class OnchainAccountPoolToken {
     // Tokens
     async initializeTokens() {
         const poolToken = await this.poolToken.getPoolToken();
-        const balance = await poolToken.methods.balanceOf(this.getAccountAddress()).call();
+        const balance = await this.getMulticall().call(poolToken.methods.balanceOf(this.getAccountAddress()));
         return (await this.poolToken.normalize(balance));
     }
     async getTokens() {

package/lib/onchain/impermaxFactory/lendingPool/nftlp/onchainNftlpGenericCL.d.ts

@@ -12,6 +12,7 @@ export default abstract class OnchainNftlpGenericCL extends OnchainNftlp {
         oraclePrice?: Promise<number>;
     };
     getOffchainNftlp: () => Promise<OffchainNftlpGenericCL>;
+    getMulticall: () => import("../../../onchainMulticall").default;
     protected tickSpacings(): Promise<Array<number>>;
     protected abstract initializeCLPool(tickSpacing: number): Promise<Contract | null>;
     getCLPool(tickSpacing: number): Promise<any>;

package/lib/onchain/impermaxFactory/lendingPool/nftlp/onchainNftlpGenericCL.js

@@ -10,6 +10,7 @@ class OnchainNftlpGenericCL extends onchainNftlp_1.default {
         super(...arguments);
         this.cache = {};
         this.getOffchainNftlp = async () => (await this.getLendingPool().getOffchainLendingPool()).getNftlp();
+        this.getMulticall = () => this.getLendingPool().getImpermaxFactory().getOnchain().multicall;
     }
     async tickSpacings() {
         return (await this.getOffchainNftlp()).tickSpacings();
@@ -34,9 +35,15 @@ class OnchainNftlpGenericCL extends onchainNftlp_1.default {
             const pool = await this.getCLPool(tickSpacing);
             if (!pool)
                 return;
-            const priceSqrtX96 = (await pool.methods.slot0().call()).sqrtPriceX96;
-            const price = (0, CLGeneral_1.formatPriceSqrtX96)(priceSqrtX96, priceAdjustment);
-            const liquidity = await pool.methods.liquidity().call() * 1;
+            // const priceSqrtX96 = (await pool.methods.slot0().call()).sqrtPriceX96;
+            // const price = formatPriceSqrtX96(priceSqrtX96, priceAdjustment);
+            // const liquidity = await pool.methods.liquidity().call() * 1;
+            const [slot0, _liquidity] = await Promise.all([
+                this.getMulticall().call(pool.methods.slot0()),
+                this.getMulticall().call(pool.methods.liquidity())
+            ]);
+            const liquidity = _liquidity * 1;
+            const price = (0, CLGeneral_1.formatPriceSqrtX96)(slot0[0], priceAdjustment);
             priceCumulative += price * liquidity;
             liquidityCumulative += liquidity;
         }));
@@ -45,7 +52,7 @@ class OnchainNftlpGenericCL extends onchainNftlp_1.default {
     async initializeOraclePrice() {
         const nftlp = await this.getNftlp();
         const priceAdjustment = await this.priceAdjustment();
-        const priceSqrtX96 = await nftlp.methods.oraclePriceSqrtX96().call();
+        const priceSqrtX96 = await this.getMulticall().call(nftlp.methods.oraclePriceSqrtX96());
         return (0, CLGeneral_1.formatPriceSqrtX96)(priceSqrtX96, priceAdjustment);
     }
     async tickToPrice(tick) {

package/lib/onchain/onchainLendingVault.d.ts

@@ -13,6 +13,7 @@ export default class OnchainLendingVault extends OnchainPoolToken {
     getOnchain: () => Onchain;
     getVaultAddress: () => string;
     getContractHelper: () => import("./onchainContractsHelper").default;
+    getMulticall: () => import("./onchainMulticall").default;
     getPoolTokenAddress(): Promise<Address>;
     getOffchainPoolToken(): Promise<OffchainLendingVault>;
     getOffchainLendingVault: () => Promise<OffchainLendingVault>;

package/lib/onchain/onchainLendingVault.js

@@ -11,6 +11,7 @@ class OnchainLendingVault extends onchainPoolToken_1.default {
         this.getOnchain = () => this.onchain;
         this.getVaultAddress = () => this.vaultAddress;
         this.getContractHelper = () => this.onchain.getContractHelper();
+        this.getMulticall = () => this.onchain.multicall;
         this.getOffchainLendingVault = this.getOffchainPoolToken;
         this.onchain = onchain;
         this.vaultAddress = vaultAddress;
@@ -30,7 +31,7 @@ class OnchainLendingVault extends onchainPoolToken_1.default {
     }
     async initializeToken() {
         const poolToken = await this.getPoolToken();
-        return this.getContractHelper().newERC20(await poolToken.methods.underlying().call());
+        return this.getContractHelper().newERC20(await this.getMulticall().call(poolToken.methods.underlying()));
     }
     // Available Liquidity
     /*private async initializeAvailableLiquidity() : Promise<number> {

package/package.json

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