impermax-sdk 2.1.467 → 2.1.468

package/lib/offchain/lendingPool/nftlp/offchainNftlpAeroCL.d.ts

@@ -5,7 +5,6 @@ import OffchainNftlpGenericCL from "./offchainNftlpGenericCL";
 export default class OffchainNftlpAeroCL extends OffchainNftlpGenericCL {
     getExtension(): Extension;
     getNewAccountNftlpObject(accountCollateral: OffchainAccountCollateralV3): OffchainAccountNftlpAeroCL;
-    protected tickSpacings: () => number[];
     initializeFullRangeRateAccurate(tickSpacing: number): Promise<number>;
     getRewardsToken(): Promise<string>;
     getRewardsTokenPrice(): Promise<number>;

package/lib/offchain/lendingPool/nftlp/offchainNftlpAeroCL.js

@@ -6,12 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const offchainAccountNftlpAeroCL_1 = __importDefault(require("../../account/lendingPool/nftlp/offchainAccountNftlpAeroCL"));
 const types_1 = require("../../../config/types");
 const offchainNftlpGenericCL_1 = __importDefault(require("./offchainNftlpGenericCL"));
-const aeroCLGeneral_1 = require("../../../utils/nftlpMath/aeroCLGeneral");
 class OffchainNftlpAeroCL extends offchainNftlpGenericCL_1.default {
-    constructor() {
-        super(...arguments);
-        this.tickSpacings = () => aeroCLGeneral_1.AERO_TICK_SPACINGS;
-    }
     getExtension() {
         return types_1.Extension.AeroCL;
     }

package/lib/offchain/lendingPool/nftlp/offchainNftlpGenericCL.d.ts

@@ -14,7 +14,7 @@ export default abstract class OffchainNftlpGenericCL extends OffchainNftlp {
             [key in number]: Promise<number>;
         };
     };
-    protected abstract tickSpacings(): Array<number>;
+    tickSpacings(): Promise<Array<number>>;
     private priceAdjustment;
     tickToPrice(tick: number): Promise<number>;
     protected initializeMarketPrice(): Promise<number>;

package/lib/offchain/lendingPool/nftlp/offchainNftlpGenericCL.js

@@ -11,6 +11,13 @@ class OffchainNftlpGenericCL extends offchainNftlp_1.default {
         super(...arguments);
         this.cache = {};
     }
+    async tickSpacings() {
+        const tickSpacings = [];
+        const nftlpGenericCLData = await this.getNftlpData();
+        const pools = nftlpGenericCLData.uniswapV3Pools;
+        pools.map((pool) => tickSpacings.push(parseInt(pool.tickSpacing)));
+        return tickSpacings;
+    }
     async priceAdjustment() {
         const decimalsA = await this.getLendingPool().getBorrowableA().getDecimals();
         const decimalsB = await this.getLendingPool().getBorrowableB().getDecimals();
@@ -79,7 +86,7 @@ class OffchainNftlpGenericCL extends offchainNftlp_1.default {
     public async getWeightedAvgFullRangeRate() {
       let totalTvl = 0;
       let totalCompoundedRate = 0;
-      for (const tickSpacing of this.tickSpacings()) {
+      for (const tickSpacing of await this.tickSpacings()) {
         const { fullRangeRate, tvlUsd } = await this.getFullRangeRateAndTvl(tickSpacing);
         totalTvl += tvlUsd;
         totalCompoundedRate += fullRangeRate * tvlUsd;
@@ -112,7 +119,7 @@ class OffchainNftlpGenericCL extends offchainNftlp_1.default {
     }
     async getBestFullRangeRate() {
         let bestRate = 0;
-        for (const tickSpacing of this.tickSpacings()) {
+        for (const tickSpacing of await this.tickSpacings()) {
             const rate = await this.getFullRangeRateAccurate(tickSpacing);
             bestRate = Math.max(bestRate, rate);
         }

package/lib/offchain/lendingPool/nftlp/offchainNftlpUniswapV3.d.ts

@@ -5,6 +5,5 @@ import OffchainNftlpGenericCL from "./offchainNftlpGenericCL";
 export default class OffchainNftlpUniswapV3 extends OffchainNftlpGenericCL {
     getExtension(): Extension;
     getNewAccountNftlpObject(accountCollateral: OffchainAccountCollateralV3): OffchainAccountNftlpUniswapV3;
-    protected tickSpacings: () => number[];
     initializeFullRangeRateAccurate(tickSpacing: number): Promise<number>;
 }

package/lib/offchain/lendingPool/nftlp/offchainNftlpUniswapV3.js

@@ -5,15 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const offchainAccountNftlpUniswapV3_1 = __importDefault(require("../../account/lendingPool/nftlp/offchainAccountNftlpUniswapV3"));
 const types_1 = require("../../../config/types");
-const uniswapV3General_1 = require("../../../utils/nftlpMath/uniswapV3General");
 const offchainNftlpGenericCL_1 = __importDefault(require("./offchainNftlpGenericCL"));
 const Q128 = 2 ** 128;
 const Q256 = BigInt(2) ** BigInt(256);
 class OffchainNftlpUniswapV3 extends offchainNftlpGenericCL_1.default {
-    constructor() {
-        super(...arguments);
-        this.tickSpacings = () => uniswapV3General_1.UNIV3_TICK_SPACINGS;
-    }
     getExtension() {
         return types_1.Extension.UniswapV3;
     }

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

@@ -11,7 +11,6 @@ export default class OnchainNftlpAeroCL extends OnchainNftlpGenericCL {
     getNewAccountNftlpObject(accountCollateral: OnchainAccountCollateralV3): any;
     getNewInteractionsNftlpObject(interactionsCollateral: OnchainInteractionsCollateralV3): OnchainInteractionsNftlpAeroCL;
     getOffchainNftlp: () => Promise<OffchainNftlpAeroCL>;
-    protected tickSpacings: () => number[];
     protected initializeNftlp(): any;
     protected initializeCLPool(tickSpacing: number): Promise<Contract | null>;
     protected initializeNfpm(): Promise<any>;

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

@@ -7,12 +7,10 @@ const types_1 = require("../../../../config/types");
 const onchainAccountNftlpAeroCL_1 = __importDefault(require("../../../account/lendingPool/nftlp/onchainAccountNftlpAeroCL"));
 const onchainInteractionsNftlpAeroCL_1 = __importDefault(require("../../../interactions/lendingPool/nftlp/onchainInteractionsNftlpAeroCL"));
 const onchainNftlpGenericCL_1 = __importDefault(require("./onchainNftlpGenericCL"));
-const aeroCLGeneral_1 = require("../../../../utils/nftlpMath/aeroCLGeneral");
 class OnchainNftlpAeroCL extends onchainNftlpGenericCL_1.default {
     constructor() {
         super(...arguments);
         this.getOffchainNftlp = async () => (await this.getLendingPool().getOffchainLendingPool()).getNftlp();
-        this.tickSpacings = () => aeroCLGeneral_1.AERO_TICK_SPACINGS;
     }
     getExtension() {
         return types_1.Extension.AeroCL;

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

@@ -11,7 +11,7 @@ export default abstract class OnchainNftlpGenericCL extends OnchainNftlp {
         oraclePrice?: Promise<number>;
     };
     getOffchainNftlp: () => Promise<OffchainNftlpGenericCL>;
-    protected abstract tickSpacings(): Array<number>;
+    protected tickSpacings(): Promise<Array<number>>;
     protected abstract initializeCLPool(tickSpacing: number): Promise<Contract | null>;
     getCLPool(tickSpacing: number): Promise<any>;
     protected priceAdjustment(): Promise<number>;

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

@@ -11,6 +11,9 @@ class OnchainNftlpGenericCL extends onchainNftlp_1.default {
         this.cache = {};
         this.getOffchainNftlp = async () => (await this.getLendingPool().getOffchainLendingPool()).getNftlp();
     }
+    async tickSpacings() {
+        return (await this.getOffchainNftlp()).tickSpacings();
+    }
     async getCLPool(tickSpacing) {
         if (!this.cache.clPools)
             this.cache.clPools = {};
@@ -27,7 +30,7 @@ class OnchainNftlpGenericCL extends onchainNftlp_1.default {
         let priceCumulative = 0;
         let liquidityCumulative = 0;
         const priceAdjustment = await this.priceAdjustment();
-        await Promise.all(this.tickSpacings().map(async (tickSpacing) => {
+        await Promise.all((await this.tickSpacings()).map(async (tickSpacing) => {
             const pool = await this.getCLPool(tickSpacing);
             if (!pool)
                 return;

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

@@ -11,7 +11,6 @@ export default class OnchainNftlpUniswapV3 extends OnchainNftlpGenericCL {
     getNewAccountNftlpObject(accountCollateral: OnchainAccountCollateralV3): OnchainAccountNftlpUniswapV3;
     getNewInteractionsNftlpObject(interactionsCollateral: OnchainInteractionsCollateralV3): OnchainInteractionsNftlpUniswapV3;
     getOffchainNftlp: () => Promise<OffchainNftlpUniswapV3>;
-    protected tickSpacings: () => number[];
     protected initializeNftlp(): any;
     protected initializeCLPool(tickSpacing: number): Promise<Contract | null>;
 }

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

@@ -12,7 +12,6 @@ class OnchainNftlpUniswapV3 extends onchainNftlpGenericCL_1.default {
     constructor() {
         super(...arguments);
         this.getOffchainNftlp = async () => (await this.getLendingPool().getOffchainLendingPool()).getNftlp();
-        this.tickSpacings = () => uniswapV3General_1.UNIV3_TICK_SPACINGS;
     }
     getExtension() {
         return types_1.Extension.UniswapV3;

package/lib/utils/nftlpMath/uniswapV3General.d.ts

@@ -1,3 +1,2 @@
-export declare const UNIV3_TICK_SPACINGS: number[];
 export declare function uniV3FeeToTickSpacing(fee: number): any;
 export declare function uniV3TickSpacingToFee(tickSpacing: number): any;

package/lib/utils/nftlpMath/uniswapV3General.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uniV3TickSpacingToFee = exports.uniV3FeeToTickSpacing = exports.UNIV3_TICK_SPACINGS = void 0;
+exports.uniV3TickSpacingToFee = exports.uniV3FeeToTickSpacing = void 0;
 // https://support.uniswap.org/hc/en-us/articles/21069524840589-What-is-a-tick-when-providing-liquidity
 const UNIV3_FEE_TO_TICK_SPACING = {
     100: 1,
@@ -20,12 +20,6 @@ const UNIV3_TICK_SPACING_TO_FEE = {
     60: 3000,
     200: 10000,
 };
-exports.UNIV3_TICK_SPACINGS = [
-    1,
-    10,
-    60,
-    200,
-];
 function uniV3FeeToTickSpacing(fee) {
     if (!UNIV3_FEE_TO_TICK_SPACING[fee])
         throw new Error("Unsupported Uniswap V3 fee!");

package/package.json

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

package/lib/utils/nftlpMath/aeroCLGeneral.d.ts

@@ -1 +0,0 @@
-export declare const AERO_TICK_SPACINGS: number[];

package/lib/utils/nftlpMath/aeroCLGeneral.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AERO_TICK_SPACINGS = void 0;
-exports.AERO_TICK_SPACINGS = [
-    1,
-    50,
-    100,
-    200,
-    2000,
-];