impermax-sdk 2.1.321 → 2.1.322

package/lib/config/whitelist.js

@@ -411,7 +411,6 @@ exports.WHITELISTED_OLD = {
             // SolidLizard
             "0x1229aAC120Ae75301aB1c3A2A04ec14183493584",
             "0x463Ec151258370a07431068BB3BdC98B5a6bA18f",
-            "0x85de0B4E00e27fB197FF6aB705825f21Bc683a3f",
             "0xD191B203c893BEb5323c25D2efFbB3EA1f7dFd84",
             "0x9e9631f83832455FE4B83CC7Ed9D3460dbD03529",
             "0x568683dc1FDC8828230896BfC20d6Eaf91f76239",
@@ -702,6 +701,7 @@ exports.BLACKLISTED = {
             "0x1bE5e42f53B54F3eC887340Db1A7394a0A664c95", //USDC-DAI SwapFish
         ],
         [types_1.Factory.SOLV2]: [
+            "0x85de0B4E00e27fB197FF6aB705825f21Bc683a3f",
             "0xb600D52952878Db5D7c7c0bE06389c85762f8222",
             "0x01a464e2BF76Bd4A3A50073026fF2335584D67d8", //GND-gmUSD Chronos
         ]

package/lib/index.d.ts

@@ -48,7 +48,9 @@ import { MAX_TICK, MIN_TICK, formatPriceSqrtX96, uniV3TickToPrice } from "./util
 import UniswapV3Position from './utils/position/uniswapV3';
 import UniswapV2Position from './utils/position/uniswapV2';
 import Position from './utils/position/interface';
-import { BorrowableEntity } from './utils/borrowableEntity';
+import { BorrowableEntity } from './utils/borrowable/borrowableEntity';
+import { BorrowablePosition } from './utils/borrowable/borrowablePosition';
+import { LendingVaultEntity } from './utils/vault/lendingVaultEntity';
 import OffchainLendingPoolV2 from './offchain/lendingPool/offchainLendingPoolV2';
 import OffchainBorrowableV2 from './offchain/lendingPool/offchainBorrowableV2';
 import OffchainCollateralV2 from './offchain/lendingPool/offchainCollateralV2';
@@ -68,4 +70,4 @@ import OnchainAccountNftlp from './onchain/account/lendingPool/nftlp';
 import OffchainAccountBorrowableV3 from './offchain/account/lendingPool/offchainAccountBorrowableV3';
 import { PairState } from "./config/whitelist";
 import { AccountMarketData } from './offchain/account/offchainAccount';
-export { offchain, OffchainMultichain, Offchain, OffchainPoolToken, OffchainLendingPool, OffchainCollateral, OffchainBorrowable, OffchainLendingPoolV2, OffchainCollateralV2, OffchainBorrowableV2, OffchainLendingPoolV3, OffchainCollateralV3, OffchainBorrowableV3, OffchainNftlp, OffchainNftlpUniswapV3, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountPoolToken, OffchainAccountLendingPool, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainAccountLendingPoolV2, OffchainAccountCollateralV2, OffchainAccountBorrowableV2, OffchainAccountLendingPoolV3, OffchainAccountCollateralV3, OffchainAccountBorrowableV3, OffchainAccountNftlp, OffchainAccountNftlpUniswapV3, 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, OnchainImpermaxFactory, OnchainImpermaxFactoryV2, OnchainImpermaxFactoryV3, OnchainPoolToken, OnchainLendingPool, OnchainBorrowable, OnchainCollateral, OnchainLendingPoolV2, OnchainBorrowableV2, OnchainCollateralV2, OnchainLendingPoolV3, OnchainBorrowableV3, OnchainCollateralV3, OnchainNftlp, OnchainNftlpUniswapV3, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountPoolToken, OnchainAccountLendingPool, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingPoolV2, OnchainAccountBorrowableV2, OnchainAccountCollateralV2, OnchainAccountLendingPoolV3, OnchainAccountBorrowableV3, OnchainAccountCollateralV3, OnchainAccountNftlp, OnchainAccountNftlpUniswapV3, OnchainAccountLendingVault, OnchainContractsHelper, OnchainInteractions, OnchainInteractionsPoolToken, OnchainInteractionsLendingPool, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingPoolV2, OnchainInteractionsCollateralV2, OnchainInteractionsBorrowableV2, OnchainInteractionsLendingPoolV3, OnchainInteractionsCollateralV3, OnchainInteractionsBorrowableV3, OnchainInteractionsNftlp, OnchainInteractionsNftlpUniswapV3, 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, decimalToBalance, MAX_TICK, MIN_TICK, formatPriceSqrtX96, uniV3TickToPrice, isV3Factory, UniswapV3Position, UniswapV2Position, Position, BorrowableEntity, PairState, SupplyPositionsParams, BorrowPositionsParams, TopPositionsParams, VaultPositionsParams, AccountEarningsParams, AccountMarketData };
+export { offchain, OffchainMultichain, Offchain, OffchainPoolToken, OffchainLendingPool, OffchainCollateral, OffchainBorrowable, OffchainLendingPoolV2, OffchainCollateralV2, OffchainBorrowableV2, OffchainLendingPoolV3, OffchainCollateralV3, OffchainBorrowableV3, OffchainNftlp, OffchainNftlpUniswapV3, OffchainVault, OffchainLeveragedVault, OffchainLendingVault, OffchainHedgedVault, OffchainConfigManager, OffchainPairConfig, OffchainProposal, OffchainMultichainAccount, OffchainAccount, OffchainAccountPoolToken, OffchainAccountLendingPool, OffchainAccountCollateral, OffchainAccountBorrowable, OffchainAccountLendingPoolV2, OffchainAccountCollateralV2, OffchainAccountBorrowableV2, OffchainAccountLendingPoolV3, OffchainAccountCollateralV3, OffchainAccountBorrowableV3, OffchainAccountNftlp, OffchainAccountNftlpUniswapV3, 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, OnchainImpermaxFactory, OnchainImpermaxFactoryV2, OnchainImpermaxFactoryV3, OnchainPoolToken, OnchainLendingPool, OnchainBorrowable, OnchainCollateral, OnchainLendingPoolV2, OnchainBorrowableV2, OnchainCollateralV2, OnchainLendingPoolV3, OnchainBorrowableV3, OnchainCollateralV3, OnchainNftlp, OnchainNftlpUniswapV3, OnchainLendingVault, OnchainConfigManager, OnchainProposal, OnchainPairConfig, OnchainAccount, OnchainAccountPoolToken, OnchainAccountLendingPool, OnchainAccountBorrowable, OnchainAccountCollateral, OnchainAccountLendingPoolV2, OnchainAccountBorrowableV2, OnchainAccountCollateralV2, OnchainAccountLendingPoolV3, OnchainAccountBorrowableV3, OnchainAccountCollateralV3, OnchainAccountNftlp, OnchainAccountNftlpUniswapV3, OnchainAccountLendingVault, OnchainContractsHelper, OnchainInteractions, OnchainInteractionsPoolToken, OnchainInteractionsLendingPool, OnchainInteractionsCollateral, OnchainInteractionsBorrowable, OnchainInteractionsLendingPoolV2, OnchainInteractionsCollateralV2, OnchainInteractionsBorrowableV2, OnchainInteractionsLendingPoolV3, OnchainInteractionsCollateralV3, OnchainInteractionsBorrowableV3, OnchainInteractionsNftlp, OnchainInteractionsNftlpUniswapV3, 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, decimalToBalance, MAX_TICK, MIN_TICK, formatPriceSqrtX96, uniV3TickToPrice, isV3Factory, UniswapV3Position, UniswapV2Position, Position, BorrowableEntity, BorrowablePosition, LendingVaultEntity, PairState, SupplyPositionsParams, BorrowPositionsParams, TopPositionsParams, VaultPositionsParams, AccountEarningsParams, AccountMarketData };

package/lib/index.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OnchainBorrowable = exports.OnchainLendingPool = exports.OnchainPoolToken = exports.OnchainImpermaxFactoryV3 = exports.OnchainImpermaxFactoryV2 = exports.OnchainImpermaxFactory = exports.Onchain = exports.onchain = exports.VaultType = exports.VaultRisk = exports.OffchainSolidexHelper = exports.OffchainPriceHelper = exports.OffchainAccountVault = exports.OffchainLeveragedPosition = exports.OffchainAccountNftlpUniswapV3 = exports.OffchainAccountNftlp = exports.OffchainAccountBorrowableV3 = exports.OffchainAccountCollateralV3 = exports.OffchainAccountLendingPoolV3 = exports.OffchainAccountBorrowableV2 = exports.OffchainAccountCollateralV2 = exports.OffchainAccountLendingPoolV2 = exports.OffchainAccountBorrowable = exports.OffchainAccountCollateral = exports.OffchainAccountLendingPool = exports.OffchainAccountPoolToken = exports.OffchainAccount = exports.OffchainMultichainAccount = exports.OffchainProposal = exports.OffchainPairConfig = exports.OffchainConfigManager = exports.OffchainHedgedVault = exports.OffchainLendingVault = exports.OffchainLeveragedVault = exports.OffchainVault = exports.OffchainNftlpUniswapV3 = exports.OffchainNftlp = exports.OffchainBorrowableV3 = exports.OffchainCollateralV3 = exports.OffchainLendingPoolV3 = exports.OffchainBorrowableV2 = exports.OffchainCollateralV2 = exports.OffchainLendingPoolV2 = exports.OffchainBorrowable = exports.OffchainCollateral = exports.OffchainLendingPool = exports.OffchainPoolToken = exports.Offchain = exports.OffchainMultichain = exports.offchain = void 0;
 exports.getNetworkFactories = exports.IMPERMAX_FACTORY = exports.IMX = exports.IMPERMAX_CHEF = exports.CLAIM_AGGREGATOR = exports.NO_CHANGES = exports.ApprovalType = exports.OnchainInteractionsConfigManager = exports.OnchainInteractionsLendingVault = exports.OnchainInteractionsNftlpUniswapV3 = exports.OnchainInteractionsNftlp = exports.OnchainInteractionsBorrowableV3 = exports.OnchainInteractionsCollateralV3 = exports.OnchainInteractionsLendingPoolV3 = exports.OnchainInteractionsBorrowableV2 = exports.OnchainInteractionsCollateralV2 = exports.OnchainInteractionsLendingPoolV2 = exports.OnchainInteractionsBorrowable = exports.OnchainInteractionsCollateral = exports.OnchainInteractionsLendingPool = exports.OnchainInteractionsPoolToken = exports.OnchainInteractions = exports.OnchainContractsHelper = exports.OnchainAccountLendingVault = exports.OnchainAccountNftlpUniswapV3 = exports.OnchainAccountNftlp = exports.OnchainAccountCollateralV3 = exports.OnchainAccountBorrowableV3 = exports.OnchainAccountLendingPoolV3 = exports.OnchainAccountCollateralV2 = exports.OnchainAccountBorrowableV2 = exports.OnchainAccountLendingPoolV2 = exports.OnchainAccountCollateral = exports.OnchainAccountBorrowable = exports.OnchainAccountLendingPool = exports.OnchainAccountPoolToken = exports.OnchainAccount = exports.OnchainPairConfig = exports.OnchainProposal = exports.OnchainConfigManager = exports.OnchainLendingVault = exports.OnchainNftlpUniswapV3 = exports.OnchainNftlp = exports.OnchainCollateralV3 = exports.OnchainBorrowableV3 = exports.OnchainLendingPoolV3 = exports.OnchainCollateralV2 = exports.OnchainBorrowableV2 = exports.OnchainLendingPoolV2 = exports.OnchainCollateral = void 0;
 exports.PermitType = exports.PositionType = exports.LendingPoolVersion = exports.SortDirection = exports.LendingPoolListOrderBy = exports.VaultListOrderBy = exports.WhitelistState = exports.ProposalState = 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 = void 0;
-exports.BorrowableEntity = exports.UniswapV2Position = exports.UniswapV3Position = exports.isV3Factory = exports.uniV3TickToPrice = exports.formatPriceSqrtX96 = exports.MIN_TICK = exports.MAX_TICK = exports.decimalToBalance = exports.Borrowable = void 0;
+exports.LendingVaultEntity = exports.BorrowablePosition = exports.BorrowableEntity = exports.UniswapV2Position = exports.UniswapV3Position = exports.isV3Factory = exports.uniV3TickToPrice = exports.formatPriceSqrtX96 = exports.MIN_TICK = exports.MAX_TICK = exports.decimalToBalance = exports.Borrowable = 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; } });
@@ -223,8 +223,12 @@ 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;
-const borrowableEntity_1 = require("./utils/borrowableEntity");
+const borrowableEntity_1 = require("./utils/borrowable/borrowableEntity");
 Object.defineProperty(exports, "BorrowableEntity", { enumerable: true, get: function () { return borrowableEntity_1.BorrowableEntity; } });
+const borrowablePosition_1 = require("./utils/borrowable/borrowablePosition");
+Object.defineProperty(exports, "BorrowablePosition", { enumerable: true, get: function () { return borrowablePosition_1.BorrowablePosition; } });
+const lendingVaultEntity_1 = require("./utils/vault/lendingVaultEntity");
+Object.defineProperty(exports, "LendingVaultEntity", { enumerable: true, get: function () { return lendingVaultEntity_1.LendingVaultEntity; } });
 const offchainLendingPoolV2_1 = __importDefault(require("./offchain/lendingPool/offchainLendingPoolV2"));
 exports.OffchainLendingPoolV2 = offchainLendingPoolV2_1.default;
 const offchainBorrowableV2_1 = __importDefault(require("./offchain/lendingPool/offchainBorrowableV2"));

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

@@ -2,7 +2,7 @@ import { BorrowablePastData, PoolTokenData } from "../offchainTypes";
 import { Address, Borrowable } from "../../config/types";
 import OffchainPoolToken from "../offchainPoolToken";
 import OffchainLendingPool from "./offchainLendingPool";
-import { BorrowableEntity } from "../../utils/borrowableEntity";
+import { BorrowableEntity } from "../../utils/borrowable/borrowableEntity";
 export default class OffchainBorrowable extends OffchainPoolToken {
     protected readonly lendingPool: OffchainLendingPool;
     protected readonly borrowable: Borrowable;

package/lib/offchain/lendingPool/offchainBorrowable.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const offchainPoolToken_1 = __importDefault(require("../offchainPoolToken"));
-const borrowableEntity_1 = require("../../utils/borrowableEntity");
+const borrowableEntity_1 = require("../../utils/borrowable/borrowableEntity");
 class OffchainBorrowable extends offchainPoolToken_1.default {
     async createBorrowableObject(lockStateChange = false) {
         const { kinkBorrowRate } = await this._calculateBorrowRate();

package/lib/onchain/impermaxFactory/lendingPool/onchainBorrowable.d.ts

@@ -3,7 +3,7 @@ import { Address, Borrowable } from '../../../config/types';
 import OnchainLendingPool from './index';
 import OnchainPoolToken from '../../onchainPoolToken';
 import OffchainBorrowable from '../../../offchain/lendingPool/offchainBorrowable';
-import { BorrowableEntity } from "../../../utils/borrowableEntity";
+import { BorrowableEntity } from "../../../utils/borrowable/borrowableEntity";
 export default abstract class OnchainBorrowable extends OnchainPoolToken {
     protected readonly lendingPool: OnchainLendingPool;
     protected readonly borrowable: Borrowable;

package/lib/utils/{borrowableEntity → borrowable/borrowableEntity}/index.d.ts

@@ -33,11 +33,16 @@ export declare class BorrowableEntity {
     getSupplyRate(): number;
     getBorrowAPR(): number;
     getSupplyAPR(): number;
+    getKinkSupplyRate(): number;
+    calculateUtilizationForRate(rate: number): number;
+    calculateAmountForRate(rate: number): number;
     /**
      * PUBLIC SETTERS
      */
-    supply(amount: number): void;
-    withdraw(amount: number): void;
-    borrow(amount: number): void;
-    repay(amount: number): void;
+    resetSupply(): void;
+    supply(amount: number, relative?: boolean): void;
+    withdraw(amount: number, relative?: boolean): void;
+    resetBorrow(): void;
+    borrow(amount: number, relative?: boolean): void;
+    repay(amount: number, relative?: boolean): void;
 }

package/lib/utils/{borrowableEntity → borrowable/borrowableEntity}/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BorrowableEntity = void 0;
-const index_1 = require("../index");
+const index_1 = require("../../index");
 class BorrowableEntity {
     constructor(params) {
         this.totalSupply = params.totalSupply;
@@ -17,7 +17,7 @@ class BorrowableEntity {
     }
     checkLock() {
         if (this.lockStateChange)
-            throw Error("Can't change state of original position object");
+            throw new Error("Can't change state of original position object");
         else
             this.state++;
     }
@@ -66,34 +66,67 @@ class BorrowableEntity {
     getSupplyAPR() {
         return (0, index_1.toAPR)(this.getSupplyRate());
     }
+    getKinkSupplyRate() {
+        return this.kinkBorrowRate * this.kinkUtilizationRate * (1 - this.reserveFactor);
+    }
+    calculateUtilizationForRate(rate) {
+        if (rate < this.getKinkSupplyRate()) {
+            return Math.sqrt(rate / this.getKinkSupplyRate()) * this.kinkUtilizationRate;
+        }
+        else {
+            const a = this.kinkMultiplier - 1;
+            const b = this.kinkUtilizationRate * this.kinkMultiplier - 1;
+            const c = rate * this.kinkUtilizationRate * (1 - this.kinkUtilizationRate) / this.getKinkSupplyRate();
+            return (b + Math.sqrt(b * b + 4 * a * c)) / (a * 2);
+        }
+    }
+    calculateAmountForRate(rate) {
+        if (rate <= 0)
+            throw new Error("Target rate is 0 or negative");
+        if (rate > this.getSupplyRate())
+            throw new Error("Target rate is higher than current rate");
+        const targetUtilizationRate = this.calculateUtilizationForRate(rate);
+        const targetSupply = this.totalBorrows / targetUtilizationRate;
+        if (targetSupply < this.totalSupply)
+            throw new Error("Target supply is lower than current supply");
+        return targetSupply - this.totalSupply;
+    }
     /**
      * PUBLIC SETTERS
      */
-    supply(amount) {
+    resetSupply() {
+        this.totalSupply = this.initialTotalSupply;
+    }
+    supply(amount, relative = false) {
         this.checkLock();
-        this.totalSupply = this.initialTotalSupply + amount;
+        if (!relative)
+            this.resetSupply();
+        this.totalSupply += amount;
     }
-    withdraw(amount) {
+    withdraw(amount, relative = false) {
         this.checkLock();
-        if (amount > this.getInitialAvailableToWithdraw()) {
+        if (!relative)
+            this.resetSupply();
+        if (amount > this.getAvailableToWithdraw())
             throw new Error("Trying to withdraw more than available liquidity");
-        }
-        else {
-            this.totalSupply = this.initialTotalSupply - amount;
-        }
+        this.totalSupply -= amount;
+    }
+    resetBorrow() {
+        this.totalBorrows = this.initialTotalBorrows;
     }
-    borrow(amount) {
+    borrow(amount, relative = false) {
         this.checkLock();
-        if (amount > this.getInitialAvailableToBorrow()) {
+        if (!relative)
+            this.resetBorrow();
+        if (amount > this.getAvailableToBorrow())
             throw new Error("Trying to borrow more than available liquidity");
-        }
-        else {
-            this.totalBorrows = this.initialTotalBorrows + amount;
-        }
+        this.totalBorrows += amount;
     }
-    repay(amount) {
+    repay(amount, relative = false) {
         this.checkLock();
-        this.totalBorrows = Math.max(this.initialTotalBorrows - amount, 0);
+        if (!relative)
+            this.resetBorrow();
+        this.totalBorrows = Math.max(this.totalBorrows - amount, 0);
     }
 }
 exports.BorrowableEntity = BorrowableEntity;

package/lib/utils/borrowable/borrowablePosition/index.d.ts

@@ -0,0 +1,27 @@
+import { BorrowableEntity } from "../borrowableEntity";
+export interface BorrowablePositionParams {
+    borrowable: BorrowableEntity;
+    amount: number;
+    lockStateChange?: boolean;
+}
+export declare class BorrowablePosition {
+    lockStateChange: boolean;
+    containsErrors: boolean;
+    state: number;
+    borrowable: BorrowableEntity;
+    amount: number;
+    initialAmount: number;
+    constructor(params: BorrowablePositionParams);
+    protected checkLock(): void;
+    /**
+     * PUBLIC GETTERS
+     */
+    getAvailableToWithdraw(): number;
+    getInitialAvailableToWithdraw(): number;
+    /**
+     * PUBLIC SETTERS
+     */
+    reset(): void;
+    supply(amount: number, relative?: boolean): void;
+    withdraw(amount: number, relative?: boolean): void;
+}

package/lib/utils/borrowable/borrowablePosition/index.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BorrowablePosition = void 0;
+class BorrowablePosition {
+    constructor(params) {
+        this.borrowable = params.borrowable;
+        this.amount = params.amount;
+        this.initialAmount = params.amount;
+        this.lockStateChange = params.lockStateChange ?? true;
+        this.state = 0;
+    }
+    checkLock() {
+        if (this.lockStateChange)
+            throw new Error("Can't change state of original position object");
+        else
+            this.state++;
+    }
+    /**
+     * PUBLIC GETTERS
+     */
+    getAvailableToWithdraw() {
+        return Math.min(this.amount, this.borrowable.getAvailableToWithdraw());
+    }
+    getInitialAvailableToWithdraw() {
+        return Math.min(this.initialAmount, this.borrowable.getInitialAvailableToWithdraw());
+    }
+    /**
+     * PUBLIC SETTERS
+     */
+    reset() {
+        this.amount = this.initialAmount;
+        this.borrowable.resetSupply();
+    }
+    supply(amount, relative = false) {
+        this.checkLock();
+        if (!relative)
+            this.reset();
+        this.borrowable.supply(amount);
+        this.amount += amount;
+    }
+    withdraw(amount, relative = false) {
+        this.checkLock();
+        if (!relative)
+            this.reset();
+        if (amount > this.getAvailableToWithdraw())
+            throw new Error("Trying to withdraw more than available to withdraw");
+        this.borrowable.withdraw(amount);
+        this.amount -= amount;
+    }
+}
+exports.BorrowablePosition = BorrowablePosition;

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

@@ -1,5 +1,5 @@
 import Position from "./interface";
-import { BorrowableEntity } from "../borrowableEntity";
+import { BorrowableEntity } from "../borrowable/borrowableEntity";
 export interface GenericPositionParams {
     liquidity: number;
     debtX: number;

package/lib/utils/position/genericPosition.js

@@ -24,7 +24,7 @@ class GenericPosition {
     }
     checkLock() {
         if (this.lockStateChange)
-            throw Error("Can't change state of original position object");
+            throw new Error("Can't change state of original position object");
         else
             this.state++;
     }

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

@@ -1,5 +1,5 @@
 import GenericPosition from "../genericPosition";
-import { BorrowableEntity } from "../../borrowableEntity";
+import { BorrowableEntity } from "../../borrowable/borrowableEntity";
 export interface UniswapV2PositionParams {
     liquidity: number;
     debtX: number;

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

@@ -1,5 +1,5 @@
 import GenericPosition from "../genericPosition";
-import { BorrowableEntity } from "../../borrowableEntity";
+import { BorrowableEntity } from "../../borrowable/borrowableEntity";
 export interface UniswapV3PositionParams {
     liquidity: number;
     unclaimedFeesX: number;

package/lib/utils/vault/lendingVaultEntity/index.d.ts

@@ -0,0 +1,32 @@
+import { BorrowablePosition } from "../../borrowable/borrowablePosition";
+export interface LendingVaultEntityParams {
+    positions: Array<BorrowablePosition>;
+    totalBalance: number;
+    reserveFactor: number;
+    lockStateChange?: boolean;
+}
+export declare class LendingVaultEntity {
+    lockStateChange: boolean;
+    containsErrors: boolean;
+    state: number;
+    positions: Array<BorrowablePosition>;
+    totalBalance: number;
+    initialTotalBalance: number;
+    reserveFactor: number;
+    constructor(params: LendingVaultEntityParams);
+    protected checkLock(): void;
+    /**
+     * PUBLIC GETTERS
+     */
+    getTotalSupply(): number;
+    getAvailableLiquidity(): number;
+    getSupplyRate(): number;
+    getSupplyAPR(): number;
+    /**
+     * PUBLIC SETTERS
+     */
+    reset(): void;
+    supply(amount: number, relative?: boolean): void;
+    withdraw(amount: number, relative?: boolean): void;
+    reallocate(withdrawAmount?: number): void;
+}

package/lib/utils/vault/lendingVaultEntity/index.js

@@ -0,0 +1,123 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LendingVaultEntity = void 0;
+const index_1 = require("../../index");
+class LendingVaultEntity {
+    constructor(params) {
+        this.positions = params.positions;
+        this.totalBalance = params.totalBalance;
+        this.initialTotalBalance = params.totalBalance;
+        this.reserveFactor = params.reserveFactor;
+        this.lockStateChange = params.lockStateChange ?? true;
+        this.state = 0;
+    }
+    checkLock() {
+        if (this.lockStateChange)
+            throw new Error("Can't change state of original position object");
+        else
+            this.state++;
+    }
+    // TODO recreate reallocate algorithm
+    /**
+     * PUBLIC GETTERS
+     */
+    getTotalSupply() {
+        let acc = this.totalBalance;
+        for (let position of this.positions) {
+            acc += position.amount;
+        }
+        return acc;
+    }
+    getAvailableLiquidity() {
+        let acc = this.totalBalance;
+        for (let position of this.positions) {
+            acc += position.getAvailableToWithdraw();
+        }
+        return acc;
+    }
+    getSupplyRate() {
+        let acc = 0;
+        for (let position of this.positions) {
+            acc += position.amount * position.borrowable.getSupplyRate();
+        }
+        return acc / this.getTotalSupply();
+    }
+    getSupplyAPR() {
+        return (0, index_1.toAPR)(this.getSupplyRate());
+    }
+    /**
+     * PUBLIC SETTERS
+     */
+    reset() {
+        this.totalBalance = this.initialTotalBalance;
+        for (let position of this.positions) {
+            position.reset();
+        }
+    }
+    supply(amount, relative = false) {
+        this.checkLock();
+        if (!relative)
+            this.reset();
+        this.totalBalance += amount;
+        this.reallocate();
+    }
+    withdraw(amount, relative = false) {
+        this.checkLock();
+        if (!relative)
+            this.reset();
+        this.reallocate(amount);
+    }
+    // TODO this should reallocate only across enabled borrowables
+    reallocate(withdrawAmount = 0) {
+        if (this.positions.length === 0)
+            return;
+        for (let position of this.positions) {
+            const amount = position.getAvailableToWithdraw();
+            position.withdraw(amount, true);
+            this.totalBalance += amount;
+        }
+        if (withdrawAmount > this.totalBalance)
+            throw new Error("Withdraw amount exceeds totalBalance");
+        this.totalBalance -= withdrawAmount;
+        const sortedPositions = [...this.positions];
+        sortedPositions.sort((a, b) => b.borrowable.getSupplyRate() - a.borrowable.getSupplyRate());
+        // Allocate in the pool with the highest APR an amount such that the next APR matches the one
+        // of the pool with the second highest APR.
+        // Repeat until all the pools with the highest APR have the same APR.
+        let i;
+        for (i = 1; i < sortedPositions.length; i++) {
+            const targetRate = sortedPositions[i].borrowable.getSupplyRate();
+            if (targetRate === 0)
+                break;
+            let amountThisCycle = 0;
+            const amounts = [];
+            for (let j = 0; j < i; j++) {
+                if (sortedPositions[j].borrowable.getSupplyRate() <= targetRate)
+                    break;
+                const targetAmount = sortedPositions[j].borrowable.calculateAmountForRate(targetRate);
+                amounts.push(targetAmount);
+                amountThisCycle += targetAmount;
+            }
+            if (amountThisCycle > this.totalBalance)
+                break;
+            for (let j = 0; j < amounts.length; j++) {
+                sortedPositions[j].supply(amounts[j], true);
+                this.totalBalance -= amounts[j];
+            }
+        }
+        const lastCycle = i;
+        // distribute the amount left equally among pools with highest APR proportionally to their total supply
+        let globalTotalSupply = 0;
+        const totalAmountToAllocate = this.totalBalance;
+        for (i = 0; i < lastCycle; i++) {
+            globalTotalSupply += sortedPositions[i].borrowable.totalSupply;
+        }
+        for (i = 0; i < lastCycle && this.totalBalance > 0; i++) {
+            const amount = globalTotalSupply === 0 ? this.totalBalance
+                : sortedPositions[i].borrowable.totalSupply * totalAmountToAllocate / globalTotalSupply;
+            sortedPositions[i].supply(amount, true);
+            this.totalBalance -= amount;
+        }
+    }
+}
+exports.LendingVaultEntity = LendingVaultEntity;

package/package.json

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