impermax-sdk 2.1.170 → 2.1.172

package/lib/index.d.ts

@@ -46,4 +46,5 @@ import OffchainAccountLendingPoolV3 from "./offchain/account/lendingPool/offchai
 import OffchainAccountNftlpUniswapV3 from './offchain/account/lendingPool/nftlp/offchainAccountNftlpUniswapV3';
 import { MAX_TICK, MIN_TICK, formatPriceSqrtX96, uniV3TickToPrice } from "./utils/nftlpMath/uniswapV3General";
 import UniswapV3Position from './utils/position/uniswapV3';
-export { offchain, OffchainMultichain, Offchain, OffchainLendingPool, OffchainPoolToken, OffchainCollateral, OffchainBorrowable, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountLendingPool, OffchainAccountPoolToken, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainLeveragedPosition, OffchainAccountVault, OffchainPriceHelper, OffchainSolidexHelper, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XimxData, LendingVaultData, VaultPosition, PairConfigData, ProposalData, ProposalMetadata, VaultRisk, VaultType, onchain, Onchain, OnchainLendingPool, OnchainPoolToken, OnchainBorrowable, OnchainCollateral, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountLendingPool, OnchainAccountPoolToken, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingVault, OnchainContractsHelper, OnchainImpermaxFactory, OnchainInteractions, OnchainInteractionsLendingPool, OnchainInteractionsPoolToken, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingVault, OnchainInteractionsConfigManager, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CollateralConfig, BorrowableV2Config, BorrowableV3Config, PairConfig, CLAIM_AGGREGATOR, IMPERMAX_CHEF, IMX, IMPERMAX_FACTORY, getNetworkFactories, getFactoryByAddress, LENDING_VAULT_WATCHER, MERKLE_DISTRIBUTOR_IBEX, MERKLE_DISTRIBUTOR_IBEX_2, MERKLE_DISTRIBUTOR_ETH, ROUTER, SIMPLE_UNISWAP_ORACLE, WETH, MERKLE_URL_ETH, MERKLE_URL_IBEX, MERKLE_URL_IBEX_2, hrAmms, AMM_FACTORY, getAmmByFactory, AMM_SUBGRAPH_URLS, ADD_LIQUIDITY_URLS, AMM_LP_FEE, DEBANK_IDS, ETH_SYMBOL, ETH_NAME, SOLIDEX_FACTORIES, BORROW_FEE_FACTORIES, OLD_KINK_MULTIPLIER_FACTORIES, LIQUIDATION_FEE_FACTORIES, V2_FACTORIES, Farms, hrFarms, FarmIndex, STAKED_LP_FACTORY, getFarmByStakedLPFactory, NOT_SYNCED, DEADLINE, ZERO, APPROVE_AMOUNT, IMPERMAX_SUBGRAPH_URL, IMPERMAX_CHEF_SUBGRAPH_URL, BLOCKS_SUBGRAPH_URL, XIMX_SUBGRAPH_URL, Networks, Factory, Extension, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, ProposalState, WhitelistState, VaultListOrderBy, VaultListParams, LendingPoolListOrderBy, LendingPoolListParams, SortDirection, LendingPoolVersion, PositionType, AccountPosition, PermitType, Permits, Permit, Borrowable, OnchainInteractionsLendingPoolV3, OnchainInteractionsNftlpUniswapV3, decimalToBalance, OffchainAccountLendingPoolV3, OffchainAccountNftlpUniswapV3, MAX_TICK, MIN_TICK, formatPriceSqrtX96, uniV3TickToPrice, isV3Factory, UniswapV3Position, OnchainAccountNftlpUniswapV3, OnchainAccountLendingPoolV3, OnchainAccountLendingPoolV2 };
+import UniswapV2Position from './utils/position/uniswapV2';
+export { offchain, OffchainMultichain, Offchain, OffchainLendingPool, OffchainPoolToken, OffchainCollateral, OffchainBorrowable, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountLendingPool, OffchainAccountPoolToken, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainLeveragedPosition, OffchainAccountVault, OffchainPriceHelper, OffchainSolidexHelper, PoolTokenData, BorrowableData, CollateralData, BorrowablePastData, TokenData, RewardData, PairData, FarmingPoolData, LendingPoolPastData, LendingPoolData, CollateralPosition, SupplyPosition, BorrowPosition, UserData, TvlData, XimxData, LendingVaultData, VaultPosition, PairConfigData, ProposalData, ProposalMetadata, VaultRisk, VaultType, onchain, Onchain, OnchainLendingPool, OnchainPoolToken, OnchainBorrowable, OnchainCollateral, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountLendingPool, OnchainAccountLendingPoolV2, OnchainAccountLendingPoolV3, OnchainAccountNftlpUniswapV3, OnchainAccountPoolToken, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingVault, OnchainContractsHelper, OnchainImpermaxFactory, OnchainInteractions, OnchainInteractionsLendingPool, OnchainInteractionsPoolToken, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingVault, OnchainInteractionsConfigManager, Contract, ApprovalType, PermitData, OnchainConfig, Changes, NO_CHANGES, Values, AirdropData, PendingRewardUI, CollateralConfig, BorrowableV2Config, BorrowableV3Config, PairConfig, CLAIM_AGGREGATOR, IMPERMAX_CHEF, IMX, IMPERMAX_FACTORY, getNetworkFactories, getFactoryByAddress, LENDING_VAULT_WATCHER, MERKLE_DISTRIBUTOR_IBEX, MERKLE_DISTRIBUTOR_IBEX_2, MERKLE_DISTRIBUTOR_ETH, ROUTER, SIMPLE_UNISWAP_ORACLE, WETH, MERKLE_URL_ETH, MERKLE_URL_IBEX, MERKLE_URL_IBEX_2, hrAmms, AMM_FACTORY, getAmmByFactory, AMM_SUBGRAPH_URLS, ADD_LIQUIDITY_URLS, AMM_LP_FEE, DEBANK_IDS, ETH_SYMBOL, ETH_NAME, SOLIDEX_FACTORIES, BORROW_FEE_FACTORIES, OLD_KINK_MULTIPLIER_FACTORIES, LIQUIDATION_FEE_FACTORIES, V2_FACTORIES, Farms, hrFarms, FarmIndex, STAKED_LP_FACTORY, getFarmByStakedLPFactory, NOT_SYNCED, DEADLINE, ZERO, APPROVE_AMOUNT, IMPERMAX_SUBGRAPH_URL, IMPERMAX_CHEF_SUBGRAPH_URL, BLOCKS_SUBGRAPH_URL, XIMX_SUBGRAPH_URL, Networks, Factory, Extension, PoolTokenType, Amms, Address, NetworkIndex, FactoryIndex, AddressIndex, NetworkFactoryIndex, LendingPoolIndex, AmmIndex, DistributorDetails, ProposalState, WhitelistState, VaultListOrderBy, VaultListParams, LendingPoolListOrderBy, LendingPoolListParams, SortDirection, LendingPoolVersion, PositionType, AccountPosition, PermitType, Permits, Permit, Borrowable, OnchainInteractionsLendingPoolV3, OnchainInteractionsNftlpUniswapV3, decimalToBalance, OffchainAccountLendingPoolV3, OffchainAccountNftlpUniswapV3, MAX_TICK, MIN_TICK, formatPriceSqrtX96, uniV3TickToPrice, isV3Factory, UniswapV3Position, UniswapV2Position, };

package/lib/index.js

@@ -26,9 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OnchainInteractionsLendingVault = exports.OnchainInteractionsBorrowable = exports.OnchainInteractionsCollateral = exports.OnchainInteractionsPoolToken = exports.OnchainInteractionsLendingPool = exports.OnchainInteractions = exports.OnchainImpermaxFactory = exports.OnchainContractsHelper = exports.OnchainAccountLendingVault = exports.OnchainAccountCollateral = exports.OnchainAccountBorrowable = exports.OnchainAccountPoolToken = exports.OnchainAccountLendingPool = exports.OnchainAccount = exports.OnchainPairConfig = exports.OnchainProposal = exports.OnchainConfigManager = exports.OnchainLendingVault = exports.OnchainCollateral = exports.OnchainBorrowable = exports.OnchainPoolToken = exports.OnchainLendingPool = exports.Onchain = exports.onchain = exports.VaultType = exports.VaultRisk = exports.OffchainSolidexHelper = exports.OffchainPriceHelper = exports.OffchainAccountVault = exports.OffchainLeveragedPosition = exports.OffchainAccountBorrowable = exports.OffchainAccountCollateral = exports.OffchainAccountPoolToken = exports.OffchainAccountLendingPool = exports.OffchainAccount = exports.OffchainMultichainAccount = exports.OffchainProposal = exports.OffchainPairConfig = exports.OffchainConfigManager = exports.OffchainHedgedVault = exports.OffchainLendingVault = exports.OffchainLeveragedVault = exports.OffchainVault = exports.OffchainBorrowable = exports.OffchainCollateral = exports.OffchainPoolToken = exports.OffchainLendingPool = exports.Offchain = exports.OffchainMultichain = exports.offchain = void 0;
-exports.Amms = exports.PoolTokenType = exports.Extension = exports.Factory = exports.Networks = exports.XIMX_SUBGRAPH_URL = exports.BLOCKS_SUBGRAPH_URL = exports.IMPERMAX_CHEF_SUBGRAPH_URL = exports.IMPERMAX_SUBGRAPH_URL = exports.APPROVE_AMOUNT = exports.ZERO = exports.DEADLINE = exports.NOT_SYNCED = exports.getFarmByStakedLPFactory = exports.STAKED_LP_FACTORY = exports.hrFarms = exports.Farms = exports.V2_FACTORIES = exports.LIQUIDATION_FEE_FACTORIES = exports.OLD_KINK_MULTIPLIER_FACTORIES = exports.BORROW_FEE_FACTORIES = exports.SOLIDEX_FACTORIES = exports.ETH_NAME = exports.ETH_SYMBOL = exports.DEBANK_IDS = exports.AMM_LP_FEE = exports.ADD_LIQUIDITY_URLS = exports.AMM_SUBGRAPH_URLS = exports.getAmmByFactory = exports.AMM_FACTORY = exports.hrAmms = exports.MERKLE_URL_IBEX_2 = exports.MERKLE_URL_IBEX = exports.MERKLE_URL_ETH = exports.WETH = exports.SIMPLE_UNISWAP_ORACLE = exports.ROUTER = exports.MERKLE_DISTRIBUTOR_ETH = exports.MERKLE_DISTRIBUTOR_IBEX_2 = exports.MERKLE_DISTRIBUTOR_IBEX = exports.LENDING_VAULT_WATCHER = exports.getFactoryByAddress = exports.getNetworkFactories = exports.IMPERMAX_FACTORY = exports.IMX = exports.IMPERMAX_CHEF = exports.CLAIM_AGGREGATOR = exports.NO_CHANGES = exports.ApprovalType = exports.OnchainInteractionsConfigManager = void 0;
-exports.OnchainAccountLendingPoolV2 = exports.OnchainAccountLendingPoolV3 = exports.OnchainAccountNftlpUniswapV3 = exports.UniswapV3Position = exports.isV3Factory = exports.uniV3TickToPrice = exports.formatPriceSqrtX96 = exports.MIN_TICK = exports.MAX_TICK = exports.OffchainAccountNftlpUniswapV3 = exports.OffchainAccountLendingPoolV3 = exports.decimalToBalance = exports.OnchainInteractionsNftlpUniswapV3 = exports.OnchainInteractionsLendingPoolV3 = exports.Borrowable = exports.PermitType = exports.PositionType = exports.LendingPoolVersion = exports.SortDirection = exports.LendingPoolListOrderBy = exports.VaultListOrderBy = exports.WhitelistState = exports.ProposalState = void 0;
+exports.OnchainInteractionsPoolToken = exports.OnchainInteractionsLendingPool = exports.OnchainInteractions = exports.OnchainImpermaxFactory = exports.OnchainContractsHelper = exports.OnchainAccountLendingVault = exports.OnchainAccountCollateral = exports.OnchainAccountBorrowable = exports.OnchainAccountPoolToken = exports.OnchainAccountNftlpUniswapV3 = exports.OnchainAccountLendingPoolV3 = exports.OnchainAccountLendingPoolV2 = exports.OnchainAccountLendingPool = exports.OnchainAccount = exports.OnchainPairConfig = exports.OnchainProposal = exports.OnchainConfigManager = exports.OnchainLendingVault = exports.OnchainCollateral = exports.OnchainBorrowable = exports.OnchainPoolToken = exports.OnchainLendingPool = exports.Onchain = exports.onchain = exports.VaultType = exports.VaultRisk = exports.OffchainSolidexHelper = exports.OffchainPriceHelper = exports.OffchainAccountVault = exports.OffchainLeveragedPosition = exports.OffchainAccountBorrowable = exports.OffchainAccountCollateral = exports.OffchainAccountPoolToken = exports.OffchainAccountLendingPool = exports.OffchainAccount = exports.OffchainMultichainAccount = exports.OffchainProposal = exports.OffchainPairConfig = exports.OffchainConfigManager = exports.OffchainHedgedVault = exports.OffchainLendingVault = exports.OffchainLeveragedVault = exports.OffchainVault = exports.OffchainBorrowable = exports.OffchainCollateral = exports.OffchainPoolToken = exports.OffchainLendingPool = exports.Offchain = exports.OffchainMultichain = exports.offchain = void 0;
+exports.Factory = exports.Networks = exports.XIMX_SUBGRAPH_URL = exports.BLOCKS_SUBGRAPH_URL = exports.IMPERMAX_CHEF_SUBGRAPH_URL = exports.IMPERMAX_SUBGRAPH_URL = exports.APPROVE_AMOUNT = exports.ZERO = exports.DEADLINE = exports.NOT_SYNCED = exports.getFarmByStakedLPFactory = exports.STAKED_LP_FACTORY = exports.hrFarms = exports.Farms = exports.V2_FACTORIES = exports.LIQUIDATION_FEE_FACTORIES = exports.OLD_KINK_MULTIPLIER_FACTORIES = exports.BORROW_FEE_FACTORIES = exports.SOLIDEX_FACTORIES = exports.ETH_NAME = exports.ETH_SYMBOL = exports.DEBANK_IDS = exports.AMM_LP_FEE = exports.ADD_LIQUIDITY_URLS = exports.AMM_SUBGRAPH_URLS = exports.getAmmByFactory = exports.AMM_FACTORY = exports.hrAmms = exports.MERKLE_URL_IBEX_2 = exports.MERKLE_URL_IBEX = exports.MERKLE_URL_ETH = exports.WETH = exports.SIMPLE_UNISWAP_ORACLE = exports.ROUTER = exports.MERKLE_DISTRIBUTOR_ETH = exports.MERKLE_DISTRIBUTOR_IBEX_2 = exports.MERKLE_DISTRIBUTOR_IBEX = exports.LENDING_VAULT_WATCHER = exports.getFactoryByAddress = exports.getNetworkFactories = exports.IMPERMAX_FACTORY = exports.IMX = exports.IMPERMAX_CHEF = exports.CLAIM_AGGREGATOR = exports.NO_CHANGES = exports.ApprovalType = exports.OnchainInteractionsConfigManager = exports.OnchainInteractionsLendingVault = exports.OnchainInteractionsBorrowable = exports.OnchainInteractionsCollateral = void 0;
+exports.UniswapV2Position = exports.UniswapV3Position = exports.isV3Factory = exports.uniV3TickToPrice = exports.formatPriceSqrtX96 = exports.MIN_TICK = exports.MAX_TICK = exports.OffchainAccountNftlpUniswapV3 = exports.OffchainAccountLendingPoolV3 = exports.decimalToBalance = exports.OnchainInteractionsNftlpUniswapV3 = exports.OnchainInteractionsLendingPoolV3 = exports.Borrowable = exports.PermitType = exports.PositionType = exports.LendingPoolVersion = exports.SortDirection = exports.LendingPoolListOrderBy = exports.VaultListOrderBy = exports.WhitelistState = exports.ProposalState = exports.Amms = exports.PoolTokenType = exports.Extension = void 0;
 const offchain_1 = __importStar(require("./offchain"));
 exports.Offchain = offchain_1.default;
 Object.defineProperty(exports, "OffchainAccount", { enumerable: true, get: function () { return offchain_1.OffchainAccount; } });
@@ -203,3 +203,5 @@ Object.defineProperty(exports, "formatPriceSqrtX96", { enumerable: true, get: fu
 Object.defineProperty(exports, "uniV3TickToPrice", { enumerable: true, get: function () { return uniswapV3General_1.uniV3TickToPrice; } });
 const uniswapV3_1 = __importDefault(require("./utils/position/uniswapV3"));
 exports.UniswapV3Position = uniswapV3_1.default;
+const uniswapV2_1 = __importDefault(require("./utils/position/uniswapV2"));
+exports.UniswapV2Position = uniswapV2_1.default;

package/lib/utils/position/index.d.ts

@@ -1 +1,2 @@
 export * from './uniswapV3';
+export * from './uniswapV2';

package/lib/utils/position/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./uniswapV3"), exports);
+__exportStar(require("./uniswapV2"), exports);

package/lib/utils/position/uniswapV2/index.d.ts

@@ -0,0 +1,98 @@
+import type { Position } from "../interface";
+export declare class UniswapV2Position implements Position {
+    lockStateChange: boolean;
+    state: number;
+    /**
+     * NOTICE all values inside this class are normalized (no decimals or mantissa to take into account)
+     */
+    liquidity: number;
+    debtX: number;
+    debtY: number;
+    initialLiquidity: number;
+    initialDebtX: number;
+    initialDebtY: number;
+    marketPrice: number;
+    oraclePrice: number;
+    safetyMargin: number;
+    liquidationPenalty: number;
+    constructor(_liquidity: number, // lp amount fixed by exchangeRate and k
+    _debtX: number, _debtY: number, _marketPrice: number, _oraclePrice: number, _safetyMargin: number, _liquidationPenalty: number, _lockStateChange: boolean);
+    private checkLock;
+    /**
+     * PRIVATE SETTERS
+     */
+    private setRealXRealY;
+    private setRealX;
+    private setRealY;
+    private setDebtX;
+    private setDebtY;
+    /**
+     * PRIVATE GETTERS
+     */
+    private getRealXGivenLiquidityAndPrice;
+    private getRealYGivenLiquidityAndPrice;
+    private getRealXGivenLiquidity;
+    private getRealYGivenLiquidity;
+    private getRealXGivenPrice;
+    private getRealYGivenPrice;
+    private getRealX;
+    private getRealY;
+    private getInitialRealX;
+    private getInitialRealY;
+    private getValueGivenPriceAndAmounts;
+    private getValueGivenAmounts;
+    private getAmountXGivenValue;
+    private getAmountYGivenValue;
+    private getDebtValueGivenPrice;
+    private getCollateralValueGivenPrice;
+    private getEquityValueGivenPrice;
+    private getDebtValue;
+    private getCollateralValue;
+    private getEquityValue;
+    private getLiquidityPostLiquidationValueGivenPriceAndDebt;
+    private isLiquidatableGivenPriceAndDebt;
+    private isLiquidatableGivenDebt;
+    private isLiquidatableGivenPrice;
+    private isUnderwaterGivenPrice;
+    private getLiquidationPriceInRange;
+    private getMaxDeltaDebtInRange;
+    /**
+     * PUBLIC SETTERS
+     */
+    depositX(amount: number): void;
+    depositY(amount: number): void;
+    withdrawX(amount: number): void;
+    withdrawY(amount: number): void;
+    borrowX(amount: number): void;
+    borrowY(amount: number): void;
+    repayX(amount: number): void;
+    repayY(amount: number): void;
+    /**
+     * PUBLIC GETTERS
+     */
+    getDepositedX(): number;
+    getDepositedY(): number;
+    getNetX(): number;
+    getNetY(): number;
+    isLiquidatable(): boolean;
+    isUnderwater(): boolean;
+    getLiquidationRange(): {
+        priceA: number;
+        priceB: number;
+    } | undefined;
+    getLeverage(): number;
+    getOptimalLiquidity(amountX: number, amountY: number): {
+        liquidity: number;
+        amountX: number;
+        amountY: number;
+    };
+    getMaxLeverage(): number;
+    getMinLeverage(): number;
+    getMaxWithdrawable(): {
+        amountX: number;
+        amountY: number;
+    };
+    getMaxBorrowableX(): number;
+    getMaxBorrowableY(): number;
+}
+export default UniswapV2Position;

package/lib/utils/position/uniswapV2/index.js

@@ -1,310 +1,332 @@
-// import type { Position } from "../interface";
-// 
-// function getVirtualX(liquidity: number, price: number) {
-//   return liquidity / Math.sqrt(price);
-// }
-// function getVirtualY(liquidity: number, price: number) {
-//   return liquidity * Math.sqrt(price);
-// }
-// function getRealX(liquidity: number, price: number, priceA: number, priceB: number) {
-//   const surplusX = getVirtualX(liquidity, priceB);
-//   const virtualX = getVirtualX(liquidity, Math.max(price, priceA));
-//   return Math.max(virtualX - surplusX, 0);
-// }
-// function getRealY(liquidity: number, price: number, priceA: number, priceB: number) {
-//   const surplusY = getVirtualY(liquidity, priceA);
-//   const virtualY = getVirtualY(liquidity, Math.min(price, priceB));
-//   return Math.max(virtualY - surplusY, 0);
-// }
-// 
-// const LOWEST_PRICE = 1 / 1e18;
-// const HIGHEST_PRICE = 1e18;
-// 
-// export class UniswapV3Position implements Position {
-//   public lockStateChange: boolean;
-// 
-//   /**
-//    * NOTICE all values inside this class are normalized (no decimals or mantissa to take into account)
-//    */
-//   public liquidity: number;
-//   public debtX: number;
-//   public debtY: number;
-//   public initialLiquidity: number;
-//   public initialDebtX: number;
-//   public initialDebtY: number;
-//   public marketPrice: number;
-//   public oraclePrice: number;
-//   public priceA: number;
-//   public priceB: number;
-//   public safetyMargin: number;
-//   public liquidationPenalty: number;
-// 
-//   // TODO add fee logic
-// 
-//   constructor(
-//     _liquidity: number,
-//     _debtX: number,
-//     _debtY: number,
-//     _marketPrice: number,
-//     _oraclePrice: number,
-//     _priceA: number,
-//     _priceB: number,
-//     _safetyMargin: number,
-//     _liquidationPenalty: number,
-//     _lockStateChange: boolean,
-//   ) {
-//     this.liquidity = _liquidity;
-//     this.debtX = _debtX;
-//     this.debtY = _debtY;
-//     this.initialLiquidity = _liquidity;
-//     this.initialDebtX = _debtX;
-//     this.initialDebtY = _debtY;
-//     this.marketPrice = _marketPrice;
-//     this.oraclePrice = _oraclePrice;
-//     this.priceA = _priceA;
-//     this.priceB = _priceB;
-//     this.safetyMargin = _safetyMargin;
-//     this.liquidationPenalty = _liquidationPenalty;
-//     this.lockStateChange = _lockStateChange;
-//   }
-// 
-//   private checkLock() {
-//     if (this.lockStateChange) throw Error("Can't change state of original position object");
-//     else this.state++;
-//   }
-// 
-//   /**
-//    * PRIVATE
-//    */
-// 
-//   private getRealXGivenLiquidityAndPrice(liquidity: number, price: number) {
-//     return getRealX(liquidity, price, this.priceA, this.priceB);
-//   }
-//   private getRealYGivenLiquidityAndPrice(liquidity: number, price: number) {
-//     return getRealY(liquidity, price, this.priceA, this.priceB);
-//   }
-//   private getRealXGivenLiquidity(liquidity: number) {
-//     return this.getRealXGivenLiquidityAndPrice(liquidity, this.marketPrice);
-//   }
-//   private getRealYGivenLiquidity(liquidity: number) {
-//     return this.getRealYGivenLiquidityAndPrice(liquidity, this.marketPrice);
-//   }
-//   private getRealXGivenPrice(price: number) {
-//     return this.getRealXGivenLiquidityAndPrice(this.liquidity, price);
-//   }
-//   private getRealYGivenPrice(price: number) {
-//     return this.getRealYGivenLiquidityAndPrice(this.liquidity, price);
-//   }
-//   private getInitialRealX() {
-//     return this.getRealXGivenLiquidityAndPrice(this.initialLiquidity, this.marketPrice);
-//   }
-//   private getInitialRealY() {
-//     return this.getRealYGivenLiquidityAndPrice(this.initialLiquidity, this.marketPrice);
-//   }
-// 
-//   private getValueGivenPriceAndAmounts(price: number, amountX: number, amountY: number) : number {
-//     return amountX * price + amountY;
-//   }
-//   private getValueGivenAmounts(amountX: number, amountY: number) : number {
-//     return amountX * this.marketPrice + amountY;
-//   }
-//   private getDebtValueGivenPrice(price: number) {
-//     return this.getValueGivenPriceAndAmounts(price, this.debtX, this.debtY);
-//   }
-//   private getCollateralValueGivenPrice(price: number) {
-//     return this.getValueGivenPriceAndAmounts(price, this.getRealXGivenPrice(price), this.getRealYGivenPrice(price));
-//   }
-//   private getEquityValueGivenPrice(price: number) {
-//     return this.getCollateralValueGivenPrice(price) - this.getDebtValueGivenPrice(price);
-//   }
-//   private getDebtValue() {
-//     return this.getDebtValueGivenPrice(this.marketPrice);
-//   }
-//   private getCollateralValue() {
-//     return this.getCollateralValueGivenPrice(this.marketPrice);
-//   }
-//   private getEquityValue() {
-//     return this.getEquityValueGivenPrice(this.marketPrice);
-//   }
-// 
-// 
-//   private isLiquidatableGivenPrice(price: number) : boolean {
-//     return this.getEquityValueGivenPrice(price / this.safetyMargin) < 0 || this.getEquityValueGivenPrice(price * this.safetyMargin) < 0;
-//   }
-//   private isUnderwaterGivenPrice(price: number) : boolean {
-//     return this.getEquityValueGivenPrice(price) < 0;
-//   }
-// 
-//   private getLiquidityGivenAmounts(amountX: number, amountY: number) : number {
-//     if (amountX == 0) {
-//       return amountY / Math.sqrt(this.marketPrice);
-//     }
-//     if (amountY == 0) {
-//       return amountX * Math.sqrt(this.marketPrice);
-//     }
-//     return amountX / (1 / Math.sqrt(this.marketPrice) - 1 / Math.sqrt(this.priceB));
-//   }
-// 
-//   private getLiquidationPriceInRange(lowPrice: number, highPrice: number, lowIsLiquidatable: boolean, highIsLiquidatable: boolean) : number | undefined {
-//     if (lowIsLiquidatable == highIsLiquidatable) return undefined;
-//     const avgPrice = Math.sqrt(lowPrice * highPrice);
-//     if (lowPrice / highPrice > 0.9999) return avgPrice;
-//     const avgIsLiquidatable = this.isLiquidatableGivenPrice(avgPrice);
-//     return this.getLiquidationPriceInRange(lowPrice, avgPrice, lowIsLiquidatable, avgIsLiquidatable)
-//         ?? this.getLiquidationPriceInRange(avgPrice, highPrice, avgIsLiquidatable, highIsLiquidatable);
-//   }
-// 
-//   /**
-//    * PUBLIC SETTERS
-//    */
-// 
-//   // Setters
-//   public setLiquidity(_liquidity: number) {
-//     this.checkLock();
-//     this.liquidity = _liquidity;
-//   }
-//   public setRealXRealY(amountX: number, amountY: number) {
-//     this.checkLock();
-//     const { liquidity } = this.getOptimalLiquidity(amountX, amountY);
-//     this.liquidity = liquidity;
-//   }
-//   public setRealX(amountX: number) {
-//     this.checkLock();
-//     const { liquidity } = this.getOptimalLiquidity(amountX, Infinity);
-//     this.liquidity = liquidity;
-//   }
-//   public setRealY(amountY: number) {
-//     this.checkLock();
-//     const { liquidity } = this.getOptimalLiquidity(Infinity, amountY);
-//     this.liquidity = liquidity;
-//   }
-//   public setDebtX(_debtX: number) {
-//     this.checkLock();
-//     this.debtX = _debtX;
-//   }
-//   public setDebtY(_debtY: number) {
-//     this.checkLock();
-//     this.debtY = _debtY;
-//   }
-// 
-//   // Actions
-//   public depositX(amount : number) {
-//     this.setRealX(this.getInitialRealX() + amount);
-//   }
-//   public depositY(amount : number) {
-//     this.setRealY(this.getInitialRealY() + amount);
-//   }
-//   public withdrawX(amount : number) {
-//     this.setRealX(Math.max(this.getInitialRealX() - amount, 0));
-//   }
-//   public withdrawY(amount : number) {
-//     this.setRealY(Math.max(this.getInitialRealY() - amount, 0));
-//   }
-//   public borrowX(amount: number) {
-//     this.setDebtX(this.initialDebtX + amount);
-//   }
-//   public borrowY(amount: number) {
-//     this.setDebtY(this.initialDebtY + amount);
-//   }
-//   public repayX(amount: number) {
-//     this.setDebtX(Math.max(this.initialDebtX - amount, 0));
-//   }
-//   public repayY(amount: number) {
-//     this.setDebtY(Math.max(this.initialDebtY - amount, 0));
-//   }
-// 
-//   /**
-//    * PUBLIC GETTERS
-//    */
-// 
-//   public getRealX() {
-//     return this.getRealXGivenLiquidityAndPrice(this.liquidity, this.marketPrice);
-//   }
-//   public getRealY() {
-//     return this.getRealYGivenLiquidityAndPrice(this.liquidity, this.marketPrice);
-//   }
-// 
-//   public getNetX() {
-//     return this.getRealX() - this.debtX;
-//   }
-//   public getNetY() {
-//     return this.getRealY() - this.debtY;
-//   }
-// 
-//   public isLiquidatable() {
-//     return this.isLiquidatableGivenPrice(this.oraclePrice);
-//   }
-//   public isUnderwater() {
-//     return this.isUnderwaterGivenPrice(this.marketPrice);
-//   }
-// 
-//   public getLiquidationRange() : {
-//     priceA: number,
-//     priceB: number
-//   } | undefined {
-//     const isLiquidatable = this.isLiquidatable();
-//     if (isLiquidatable) return undefined;
-//     const lowIsLiquidatable = this.isLiquidatableGivenPrice(LOWEST_PRICE);
-//     const highIsLiquidatable = this.isLiquidatableGivenPrice(HIGHEST_PRICE);
-//     const priceA = this.getLiquidationPriceInRange(LOWEST_PRICE, this.marketPrice, lowIsLiquidatable, isLiquidatable);
-//     const priceB = this.getLiquidationPriceInRange(this.marketPrice, HIGHEST_PRICE, isLiquidatable, highIsLiquidatable);
-//     return {
-//       priceA: priceA ? priceA : 0,
-//       priceB: priceB ? priceB : Infinity,
-//     }
-//   }
-// 
-//   public getLeverage() {
-//     return this.getCollateralValue() / this.getEquityValue();
-//   }
-// 
-//   // amountX and amountY are expected to have the same sign
-//   public getOptimalLiquidity(amountX: number, amountY: number) : {
-//     liquidity: number,
-//     amountX: number,
-//     amountY: number
-//   } {
-//     if (amountX != 0 && amountY != 0) {
-//       const sampleX = this.getRealXGivenLiquidity(1);
-//       const sampleY = this.getRealYGivenLiquidity(1);
-//       if (sampleX == 0) amountX = 0;
-//       else if (sampleY == 0) amountY = 0;
-//       else {
-//         if (Math.abs(amountX) / sampleX > Math.abs(amountY) / sampleY) amountX = amountY / sampleY * sampleX;
-//         else amountY = amountX / sampleX * sampleY;
-//       }
-//     }
-//     const liquidity = this.getLiquidityGivenAmounts(amountX, amountY)
-//     return {liquidity, amountX, amountY};
-//   }
-// 
-//   public getMaxLeverage() : number {
-//     // TODO binary search
-//     return 1;
-//   }
-//   public getMinLeverage() : number {
-//     const realX = this.getRealX();
-//     const realY = this.getRealY();
-//     if (realX > this.debtX && realY > this.debtY) return 0;
-//     // TODO binary search
-//     return 0;
-//   }
-//   public getMaxWithdrawable() : {
-//     amountX: number,
-//     amountY: number
-//   } {
-//     let amountX = 0, amountY = 0;
-//     // TODO binary search
-//     return {amountX, amountY};
-//   }
-//   public getMaxBorrowableX() : number {
-//     // TODO binary search
-//     return 0;
-//   }
-//   public getMaxBorrowableY() : number {
-//     // TODO binary search
-//     return 0;
-//   }
-// }
-// 
-// export default UniswapV3Position;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UniswapV2Position = void 0;
+function getRealX(liquidity, price) {
+    return liquidity / Math.sqrt(price);
+}
+function getRealY(liquidity, price) {
+    return liquidity * Math.sqrt(price);
+}
+const LOWEST_PRICE = 1 / 1e18;
+const HIGHEST_PRICE = 1e18;
+class UniswapV2Position {
+    constructor(_liquidity, // lp amount fixed by exchangeRate and k
+    _debtX, _debtY, _marketPrice, _oraclePrice, _safetyMargin, _liquidationPenalty, _lockStateChange) {
+        this.liquidity = _liquidity;
+        this.debtX = _debtX;
+        this.debtY = _debtY;
+        this.initialLiquidity = _liquidity;
+        this.initialDebtX = _debtX;
+        this.initialDebtY = _debtY;
+        this.marketPrice = _marketPrice;
+        this.oraclePrice = _oraclePrice;
+        this.safetyMargin = _safetyMargin;
+        this.liquidationPenalty = _liquidationPenalty;
+        this.lockStateChange = _lockStateChange;
+        this.state = 0;
+    }
+    checkLock() {
+        if (this.lockStateChange)
+            throw Error("Can't change state of original position object");
+        else
+            this.state++;
+    }
+    /**
+     * PRIVATE SETTERS
+     */
+    setRealXRealY(amountX, amountY) {
+        if (Number.isNaN(amountX))
+            return;
+        if (Number.isNaN(amountY))
+            return;
+        this.checkLock();
+        const { liquidity } = this.getOptimalLiquidity(amountX, amountY);
+        this.liquidity = liquidity;
+    }
+    setRealX(amountX) {
+        if (Number.isNaN(amountX))
+            return;
+        this.checkLock();
+        const { liquidity } = this.getOptimalLiquidity(amountX, Infinity);
+        this.liquidity = liquidity;
+    }
+    setRealY(amountY) {
+        if (Number.isNaN(amountY))
+            return;
+        this.checkLock();
+        const { liquidity } = this.getOptimalLiquidity(Infinity, amountY);
+        this.liquidity = liquidity;
+    }
+    setDebtX(_debtX) {
+        if (Number.isNaN(_debtX))
+            return;
+        this.checkLock();
+        this.debtX = _debtX;
+    }
+    setDebtY(_debtY) {
+        if (Number.isNaN(_debtY))
+            return;
+        this.checkLock();
+        this.debtY = _debtY;
+    }
+    /**
+     * PRIVATE GETTERS
+     */
+    getRealXGivenLiquidityAndPrice(liquidity, price) {
+        return getRealX(liquidity, price);
+    }
+    getRealYGivenLiquidityAndPrice(liquidity, price) {
+        return getRealY(liquidity, price);
+    }
+    getRealXGivenLiquidity(liquidity) {
+        return this.getRealXGivenLiquidityAndPrice(liquidity, this.marketPrice);
+    }
+    getRealYGivenLiquidity(liquidity) {
+        return this.getRealYGivenLiquidityAndPrice(liquidity, this.marketPrice);
+    }
+    getRealXGivenPrice(price) {
+        return this.getRealXGivenLiquidityAndPrice(this.liquidity, price);
+    }
+    getRealYGivenPrice(price) {
+        return this.getRealYGivenLiquidityAndPrice(this.liquidity, price);
+    }
+    getRealX() {
+        return this.getRealXGivenLiquidityAndPrice(this.liquidity, this.marketPrice);
+    }
+    getRealY() {
+        return this.getRealYGivenLiquidityAndPrice(this.liquidity, this.marketPrice);
+    }
+    getInitialRealX() {
+        return this.getRealXGivenLiquidityAndPrice(this.initialLiquidity, this.marketPrice);
+    }
+    getInitialRealY() {
+        return this.getRealYGivenLiquidityAndPrice(this.initialLiquidity, this.marketPrice);
+    }
+    getValueGivenPriceAndAmounts(price, amountX, amountY) {
+        return amountX * price + amountY;
+    }
+    getValueGivenAmounts(amountX, amountY) {
+        return amountX * this.marketPrice + amountY;
+    }
+    getAmountXGivenValue(value) {
+        return value / this.marketPrice;
+    }
+    getAmountYGivenValue(value) {
+        return value;
+    }
+    getDebtValueGivenPrice(price) {
+        return this.getValueGivenPriceAndAmounts(price, this.debtX, this.debtY);
+    }
+    getCollateralValueGivenPrice(price) {
+        return this.getValueGivenPriceAndAmounts(price, this.getRealXGivenPrice(price), this.getRealYGivenPrice(price));
+    }
+    getEquityValueGivenPrice(price) {
+        return this.getCollateralValueGivenPrice(price) - this.getDebtValueGivenPrice(price);
+    }
+    getDebtValue() {
+        return this.getDebtValueGivenPrice(this.marketPrice);
+    }
+    getCollateralValue() {
+        return this.getCollateralValueGivenPrice(this.marketPrice);
+    }
+    getEquityValue() {
+        return this.getEquityValueGivenPrice(this.marketPrice);
+    }
+    getLiquidityPostLiquidationValueGivenPriceAndDebt(price, debtX, debtY) {
+        const debtValue = this.getValueGivenPriceAndAmounts(price, debtX, debtY);
+        const collateralValue = this.getCollateralValueGivenPrice(price);
+        const collateralNeeded = debtValue * this.liquidationPenalty;
+        return collateralValue - collateralNeeded;
+    }
+    isLiquidatableGivenPriceAndDebt(price, debtX, debtY) {
+        return this.getLiquidityPostLiquidationValueGivenPriceAndDebt(price / this.safetyMargin, debtX, debtY) < 0
+            || this.getLiquidityPostLiquidationValueGivenPriceAndDebt(price * this.safetyMargin, debtX, debtY) < 0;
+    }
+    isLiquidatableGivenDebt(debtX, debtY) {
+        return this.isLiquidatableGivenPriceAndDebt(this.marketPrice, debtX, debtY);
+    }
+    isLiquidatableGivenPrice(price) {
+        return this.getEquityValueGivenPrice(price / this.safetyMargin) < 0 || this.getEquityValueGivenPrice(price * this.safetyMargin) < 0;
+    }
+    isUnderwaterGivenPrice(price) {
+        return this.getEquityValueGivenPrice(price) < 0;
+    }
+    getLiquidationPriceInRange(lowPrice, highPrice, lowIsLiquidatable, highIsLiquidatable) {
+        if (lowIsLiquidatable == highIsLiquidatable)
+            return undefined;
+        const avgPrice = Math.sqrt(lowPrice * highPrice);
+        if (lowPrice / highPrice > 0.9999)
+            return avgPrice;
+        const avgIsLiquidatable = this.isLiquidatableGivenPrice(avgPrice);
+        return this.getLiquidationPriceInRange(lowPrice, avgPrice, lowIsLiquidatable, avgIsLiquidatable)
+            ?? this.getLiquidationPriceInRange(avgPrice, highPrice, avgIsLiquidatable, highIsLiquidatable);
+    }
+    getMaxDeltaDebtInRange(lowDeltaX, lowDeltaY, highDeltaX, highDeltaY) {
+        if (Number.isNaN(lowDeltaX) || Number.isNaN(lowDeltaY) || Number.isNaN(highDeltaX) || Number.isNaN(highDeltaY))
+            return [0, 0];
+        if (highDeltaX == 0 && highDeltaY == 0)
+            return [0, 0];
+        if (Math.abs(highDeltaX / lowDeltaX) < 1.001 || Math.abs(highDeltaY / lowDeltaY) < 1.001)
+            return [lowDeltaX, lowDeltaY];
+        const avgDeltaX = (lowDeltaX + highDeltaX) / 2;
+        const avgDeltaY = (lowDeltaY + highDeltaY) / 2;
+        if (this.isLiquidatableGivenDebt(this.debtX + avgDeltaX, this.debtY + avgDeltaY))
+            return this.getMaxDeltaDebtInRange(lowDeltaX, lowDeltaY, avgDeltaX, avgDeltaY);
+        else
+            return this.getMaxDeltaDebtInRange(avgDeltaX, avgDeltaY, highDeltaX, highDeltaY);
+    }
+    /**
+     * PUBLIC SETTERS
+     */
+    depositX(amount) {
+        this.setRealX(this.getInitialRealX() + amount);
+    }
+    depositY(amount) {
+        this.setRealY(this.getInitialRealY() + amount);
+    }
+    withdrawX(amount) {
+        this.setRealX(Math.max(this.getInitialRealX() - amount, 0));
+    }
+    withdrawY(amount) {
+        this.setRealY(Math.max(this.getInitialRealY() - amount, 0));
+    }
+    borrowX(amount) {
+        this.setDebtX(this.initialDebtX + amount);
+    }
+    borrowY(amount) {
+        this.setDebtY(this.initialDebtY + amount);
+    }
+    repayX(amount) {
+        this.setDebtX(Math.max(this.initialDebtX - amount, 0));
+    }
+    repayY(amount) {
+        this.setDebtY(Math.max(this.initialDebtY - amount, 0));
+    }
+    /**
+     * PUBLIC GETTERS
+     */
+    getDepositedX() {
+        return this.getRealX();
+    }
+    getDepositedY() {
+        return this.getRealY();
+    }
+    getNetX() {
+        return this.getDepositedX() - this.debtX;
+    }
+    getNetY() {
+        return this.getDepositedY() - this.debtY;
+    }
+    isLiquidatable() {
+        return this.isLiquidatableGivenPrice(this.oraclePrice);
+    }
+    isUnderwater() {
+        return this.isUnderwaterGivenPrice(this.marketPrice);
+    }
+    getLiquidationRange() {
+        const isLiquidatable = this.isLiquidatable();
+        if (isLiquidatable)
+            return undefined;
+        const lowIsLiquidatable = this.isLiquidatableGivenPrice(LOWEST_PRICE);
+        const highIsLiquidatable = this.isLiquidatableGivenPrice(HIGHEST_PRICE);
+        const priceA = this.getLiquidationPriceInRange(LOWEST_PRICE, this.marketPrice, lowIsLiquidatable, isLiquidatable);
+        const priceB = this.getLiquidationPriceInRange(this.marketPrice, HIGHEST_PRICE, isLiquidatable, highIsLiquidatable);
+        return {
+            priceA: priceA && priceA > LOWEST_PRICE ? priceA : 0,
+            priceB: priceB && priceB < HIGHEST_PRICE ? priceB : Infinity,
+        };
+    }
+    getLeverage() {
+        const leverage = this.getCollateralValue() / this.getEquityValue();
+        if (!leverage)
+            return 1;
+        if (Number.isNaN(leverage))
+            return 1;
+        if (leverage < 1)
+            return 1;
+        return leverage;
+    }
+    // amountX and amountY are expected to have the same sign
+    getOptimalLiquidity(amountX, amountY) {
+        const liquidityA = amountX * Math.sqrt(this.marketPrice);
+        const liquidityB = amountY / Math.sqrt(this.marketPrice);
+        const liquidity = Math.min(liquidityA, liquidityB);
+        return {
+            liquidity: Number.isNaN(liquidity) ? 0 : liquidity ?? 0,
+            amountX: Number.isNaN(amountX) ? 0 : amountX ?? 0,
+            amountY: Number.isNaN(amountY) ? 0 : amountY ?? 0,
+        };
+    }
+    getMaxLeverage() {
+        const currentLeverage = this.getLeverage();
+        if (this.isLiquidatable())
+            return currentLeverage;
+        const highLeverage = 100; // we assume the position is liquidatable with this leverage
+        let setLiquidityToZero = false;
+        if (this.liquidity === 0) {
+            this.liquidity = 0.000001;
+            setLiquidityToZero = true;
+        }
+        const realX = this.getRealX();
+        const realY = this.getRealY();
+        const projectedRealX = realX * highLeverage / currentLeverage;
+        const projectedRealY = realY * highLeverage / currentLeverage;
+        const projectedDebtX = this.debtX + projectedRealX - realX;
+        const projectedDebtY = this.debtY + projectedRealY - realY;
+        const normalizedDeltaDebtX = projectedDebtX * currentLeverage / highLeverage - this.debtX;
+        const normalizedDeltaDebtY = projectedDebtY * currentLeverage / highLeverage - this.debtY;
+        const [deltaDebtX, deltaDebtY] = this.getMaxDeltaDebtInRange(0, 0, normalizedDeltaDebtX, normalizedDeltaDebtY);
+        const collateralValue = this.getCollateralValue();
+        const debtValue = this.getValueGivenAmounts(this.debtX + deltaDebtX, this.debtY + deltaDebtY);
+        const equityValue = collateralValue - debtValue;
+        if (setLiquidityToZero)
+            this.liquidity = 0;
+        return collateralValue / equityValue;
+    }
+    getMinLeverage() {
+        const depositedX = this.getDepositedX();
+        const depositedY = this.getDepositedY();
+        if (depositedX >= this.debtX && depositedY >= this.debtY)
+            return 0;
+        // TODO binary search
+        return 0;
+    }
+    getMaxWithdrawable() {
+        const depositedX = this.getDepositedX();
+        const depositedY = this.getDepositedY();
+        let percentage = 0;
+        if (!this.isLiquidatable()) {
+            if (this.debtX == 0 && this.debtY == 0) {
+                percentage = 1;
+            }
+            else {
+                const highRatio = this.getEquityValue() / this.getDebtValue();
+                const [deltaDebtX, deltaDebtY] = this.getMaxDeltaDebtInRange(0, 0, this.debtX * highRatio, this.debtY * highRatio);
+                const ratio = this.debtX > 0 ? deltaDebtX / this.debtX : deltaDebtY / this.debtY;
+                percentage = 1 / (1 / ratio + 1);
+            }
+        }
+        return {
+            amountX: depositedX * percentage,
+            amountY: depositedY * percentage,
+        };
+    }
+    getMaxBorrowableX() {
+        if (this.isLiquidatable())
+            return 0;
+        const equityValue = this.getEquityValue();
+        const highDebtX = this.getAmountXGivenValue(equityValue);
+        const [debtX,] = this.getMaxDeltaDebtInRange(0, 0, highDebtX, 0);
+        return debtX + this.debtX - this.initialDebtX;
+    }
+    getMaxBorrowableY() {
+        if (this.isLiquidatable())
+            return 0;
+        const equityValue = this.getEquityValue();
+        const highDebtY = this.getAmountYGivenValue(equityValue);
+        const [, debtY] = this.getMaxDeltaDebtInRange(0, 0, 0, highDebtY);
+        return debtY + this.debtY - this.initialDebtY;
+    }
+}
+exports.UniswapV2Position = UniswapV2Position;
+exports.default = UniswapV2Position;

package/lib/utils/position/uniswapV3/index.d.ts

@@ -51,6 +51,7 @@ export declare class UniswapV3Position implements Position {
     private getDebtValueGivenPrice;
     private getCollateralValueGivenPrice;
     private getWeightedCollateralValueGivenPrice;
+    private getWeightedCollateralValueGivenPriceAndDeltaLeverage;
     private getEquityValueGivenPrice;
     private getDebtValue;
     private getCollateralValue;

package/lib/utils/position/uniswapV3/index.js

@@ -21,7 +21,6 @@ const LOWEST_PRICE = 1 / 1e18;
 const HIGHEST_PRICE = 1e18;
 const FEE_COLLECTED_WEIGHT = 0.95;
 class UniswapV3Position {
-    // TODO add fee logic
     constructor(_liquidity, _uncollectedFeesX, _uncollectedFeesY, _debtX, _debtY, _marketPrice, _oraclePrice, _priceA, _priceB, _safetyMargin, _liquidationPenalty, _lockStateChange) {
         this.liquidity = _liquidity;
         this.uncollectedFeesX = _uncollectedFeesX;
@@ -140,6 +139,10 @@ class UniswapV3Position {
     getWeightedCollateralValueGivenPrice(price) {
         return this.getValueGivenPriceAndAmounts(price, this.getRealXGivenPrice(price) + this.uncollectedFeesX * FEE_COLLECTED_WEIGHT, this.getRealYGivenPrice(price) + this.uncollectedFeesY * FEE_COLLECTED_WEIGHT);
     }
+    getWeightedCollateralValueGivenPriceAndDeltaLeverage(price, deltaX, deltaY) {
+        const liquidity = this.getLiquidityGivenAmounts(deltaX, deltaY);
+        return this.getValueGivenPriceAndAmounts(price, this.getRealXGivenLiquidityAndPrice(this.liquidity + liquidity, price) + this.uncollectedFeesX * FEE_COLLECTED_WEIGHT, this.getRealYGivenLiquidityAndPrice(this.liquidity + liquidity, price) + this.uncollectedFeesY * FEE_COLLECTED_WEIGHT);
+    }
     getEquityValueGivenPrice(price) {
         return this.getCollateralValueGivenPrice(price) - this.getDebtValueGivenPrice(price);
     }
@@ -165,9 +168,8 @@ class UniswapV3Position {
         return collateralValue - collateralNeeded;
     }
     getWeightedLiquidityPostLiquidationValueGivenPriceAndDeltaLeverage(price, deltaX, deltaY) {
-        const deltaValue = this.getValueGivenPriceAndAmounts(price, deltaX, deltaY);
-        const debtValue = this.getDebtValueGivenPrice(price) + deltaValue;
-        const collateralValue = this.getWeightedCollateralValueGivenPrice(price) + deltaValue;
+        const debtValue = this.getDebtValueGivenPrice(price) + this.getValueGivenPriceAndAmounts(price, deltaX, deltaY);
+        const collateralValue = this.getWeightedCollateralValueGivenPriceAndDeltaLeverage(price, deltaX, deltaY);
         const collateralNeeded = debtValue * this.liquidationPenalty;
         return collateralValue - collateralNeeded;
     }
@@ -233,7 +235,7 @@ class UniswapV3Position {
             return [lowDeltaX, lowDeltaY];
         const avgDeltaX = (lowDeltaX + highDeltaX) / 2;
         const avgDeltaY = (lowDeltaY + highDeltaY) / 2;
-        if (this.isLiquidatableGivenDeltaLeverage(this.debtX + avgDeltaX, this.debtY + avgDeltaY))
+        if (this.isLiquidatableGivenDeltaLeverage(avgDeltaX, avgDeltaY))
             return this.getMaxDeltaLeverageInRange(lowDeltaX, lowDeltaY, avgDeltaX, avgDeltaY);
         else
             return this.getMaxDeltaLeverageInRange(avgDeltaX, avgDeltaY, highDeltaX, highDeltaY);

package/package.json

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