impermax-sdk 1.2.112 → 2.0.0

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

@@ -1,176 +1,131 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const types_1 = require("../../../config/types");
-const onchainAccountPoolToken_1 = __importDefault(require("../onchainAccountPoolToken"));
-class OnchainAccountBorrowable extends onchainAccountPoolToken_1.default {
-    constructor(lendingPool, poolTokenType) {
-        super();
-        this.borrowableCache = {};
-        this.getLendingPool = () => this.lendingPool;
-        this.getPoolToken = () => this.poolToken;
-        this.getAccount = () => this.lendingPool.getAccount();
-        this.getInteractionsBorrowable = this.getInteractionsPoolToken;
-        this.getOffchainAccountBorrowable = this.getOffchainAccountPoolToken;
-        // Shortcuts
-        this.getPoolTokenType = () => this.poolToken.getPoolTokenType();
-        this.getSupplyAPR = () => __awaiter(this, void 0, void 0, function* () { return (yield this.poolToken.getOffchainPoolToken()).getSupplyAPR(); });
-        this.getBorrowRate = () => __awaiter(this, void 0, void 0, function* () { return (yield this.poolToken.getOffchainPoolToken()).getBorrowRate(); });
-        this.getAccrualTimestamp = () => __awaiter(this, void 0, void 0, function* () { return (yield this.poolToken.getOffchainPoolToken()).getAccrualTimestamp(); });
-        this.lendingPool = lendingPool;
-        this.poolToken = lendingPool.getLendingPool().getPoolToken(poolTokenType);
-    }
-    getInteractionsPoolToken() {
-        return this.lendingPool.getInteractionsLendingPool().getPoolToken(this.getPoolTokenType());
-    }
-    getOffchainAccountPoolToken() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const offchainAccountLendingPool = yield this.lendingPool.getOffchainAccountLendingPool();
-            return offchainAccountLendingPool.getPoolToken(this.getPoolTokenType());
-        });
-    }
-    cleanCache() {
-        super.cleanCache();
-        this.borrowableCache = {};
-    }
-    // Borrowed
-    initializeBorrowed() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const borrowable = yield this.poolToken.getPoolToken();
-            const balance = yield borrowable.methods.borrowBalance(this.getAccountAddress()).call();
-            const storedAmount = yield yield this.poolToken.normalize(balance);
-            const accrualTimestamp = yield this.getAccrualTimestamp();
-            const borrowRate = yield this.getBorrowRate();
-            return storedAmount * (1 + (Date.now() / 1000 - accrualTimestamp) * borrowRate);
-        });
-    }
-    getBorrowed() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.borrowableCache.borrowed)
-                this.borrowableCache.borrowed = this.initializeBorrowed();
-            return this.borrowableCache.borrowed;
-        });
-    }
-    getBorrowedUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const borrowed = yield this.getBorrowed();
-            const tokenPrice = yield this.getTokenPriceAccurate();
-            return borrowed * tokenPrice;
-        });
-    }
-    // Max OffchainBorrowable
-    /*public async getMaxBorrowable() : Promise<number> {
-      const availableCash = await this.poolToken.getTotalBalance();
-      const { valueCollateral, valueA, valueB } = await this.lendingPool.getValues(NO_CHANGES);
-      const [valueBorrowed, valueOther] = this.getPoolTokenType() == PoolTokenType.BorrowableA ? [valueA, valueB] : [valueB, valueA];
-      const safetyMargin = (await this.lendingPool.getSafetyMargin()) * this.getUiMargin();
-      const liquidationPenalty = await this.lendingPool.getLiquidationPenalty();
-      const actualCollateral = valueCollateral / liquidationPenalty;
-      const totalValueBorrowable1 = (actualCollateral * Math.sqrt(safetyMargin) - valueOther) / safetyMargin;
-      const totalValueBorrowable2 = (actualCollateral / Math.sqrt(safetyMargin) - valueOther) * safetyMargin;
-      const maxValueBorrowable = Math.min(totalValueBorrowable1, totalValueBorrowable2) - valueBorrowed;
-      const price = await this.poolToken.getMarketPriceDenomLP();
-      return Math.max(0, Math.min(availableCash, maxValueBorrowable / price));
-    }*/
-    // binary search approach
-    getMaxBorrowable() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const availableCash = yield this.poolToken.getTotalBalance();
-            const twapPrice = yield this.lendingPool.getLendingPool().getTWAPPrice();
-            // start search
-            let borrowAmount = availableCash;
-            let borrowAmountPrev = 0;
-            let bestAmount = 0;
-            for (let i = 0; i < 1000; i++) {
-                const jump = Math.abs(borrowAmount - borrowAmountPrev) / 2;
-                if (jump / availableCash < 1e-9)
-                    break;
-                borrowAmountPrev = borrowAmount;
-                const changeCollateral = 0;
-                const changeBorrowedA = this.getPoolTokenType() == types_1.PoolTokenType.BorrowableA ? borrowAmount : 0;
-                const changeBorrowedB = this.getPoolTokenType() == types_1.PoolTokenType.BorrowableB ? borrowAmount : 0;
-                const changes = { changeCollateral, changeBorrowedA, changeBorrowedB };
-                const [liqPriceA, liqPriceB] = yield this.lendingPool.getLiquidationPrices(changes);
-                if (liqPriceA * this.getUiMargin() > twapPrice || liqPriceB / this.getUiMargin() < twapPrice)
-                    borrowAmount -= jump;
-                else {
-                    bestAmount = borrowAmount;
-                    borrowAmount += jump;
-                }
-            }
-            bestAmount = bestAmount > availableCash ? availableCash : bestAmount;
-            return bestAmount;
-        });
-    }
-    // Farming Shares
-    initializeFarmingShares() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.poolToken.hasImpermaxChef()))
-                return 0;
-            return (yield this.poolToken.getImpermaxChef().methods.userInfo(yield this.poolToken.getPoolTokenAddress(), this.getAccountAddress()).call()).shares;
-        });
-    }
-    getFarmingShares() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.borrowableCache.farmingShares)
-                this.borrowableCache.farmingShares = this.initializeFarmingShares();
-            return this.borrowableCache.farmingShares;
-        });
-    }
-    // Available Reward
-    initializeAvailableFarmingReward() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.poolToken.hasImpermaxChef()))
-                return 0;
-            const borrowableAddress = yield this.poolToken.getPoolTokenAddress();
-            try {
-                return (yield this.poolToken.getImpermaxChef().methods.pendingReward(borrowableAddress, this.getAccountAddress()).call()) / 1e18;
-            }
-            catch (_a) {
-                console.log("Warning: pending reward negative");
-                return 0;
-            }
-        });
-    }
-    getAvailableFarmingReward() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.borrowableCache.availableFarmingReward)
-                this.borrowableCache.availableFarmingReward = this.initializeAvailableFarmingReward();
-            return this.borrowableCache.availableFarmingReward;
-        });
-    }
-    initializeAvailableRewarderReward() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(yield this.poolToken.hasRewarder()))
-                return 0;
-            const borrowableAddress = yield this.poolToken.getPoolTokenAddress();
-            const rewarder = yield this.poolToken.getRewarder();
-            try {
-                return (yield rewarder.methods.pendingReward(borrowableAddress, this.getAccountAddress()).call()) / 1e18;
-            }
-            catch (_a) {
-                console.log("Warning: pending reward negative");
-                return 0;
-            }
-        });
-    }
-    getAvailableRewarderReward() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.borrowableCache.availableRewarderReward)
-                this.borrowableCache.availableRewarderReward = this.initializeAvailableRewarderReward();
-            return this.borrowableCache.availableRewarderReward;
-        });
-    }
-}
-exports.default = OnchainAccountBorrowable;
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const onchainAccountPoolToken_1 = __importDefault(require("../onchainAccountPoolToken"));
+class OnchainAccountBorrowable extends onchainAccountPoolToken_1.default {
+    constructor(lendingPool, borrowable) {
+        super();
+        this.borrowableCache = {};
+        this.getLendingPool = () => this.lendingPool;
+        this.getPoolToken = () => this.poolToken;
+        this.getAccount = () => this.lendingPool.getAccount();
+        this.getInteractionsBorrowable = this.getInteractionsPoolToken;
+        this.getOffchainAccountBorrowable = this.getOffchainAccountPoolToken;
+        // Shortcuts
+        this.getBorrowableType = () => this.poolToken.getBorrowableType();
+        this.getSupplyAPR = () => __awaiter(this, void 0, void 0, function* () { return (yield this.poolToken.getOffchainPoolToken()).getSupplyAPR(); });
+        this.getBorrowRate = () => __awaiter(this, void 0, void 0, function* () { return (yield this.poolToken.getOffchainPoolToken()).getBorrowRate(); });
+        this.getAccrualTimestamp = () => __awaiter(this, void 0, void 0, function* () { return (yield this.poolToken.getOffchainPoolToken()).getAccrualTimestamp(); });
+        this.lendingPool = lendingPool;
+        this.poolToken = lendingPool.getLendingPool().getBorrowable(borrowable);
+    }
+    getInteractionsPoolToken() {
+        return this.lendingPool.getInteractionsLendingPool().getBorrowable(this.getBorrowableType());
+    }
+    getOffchainAccountPoolToken() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const offchainAccountLendingPool = yield this.lendingPool.getOffchainAccountLendingPool();
+            return offchainAccountLendingPool.getBorrowable(this.getBorrowableType());
+        });
+    }
+    cleanCache() {
+        super.cleanCache();
+        this.borrowableCache = {};
+    }
+    // Borrowed
+    initializeBorrowed() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const borrowable = yield this.poolToken.getPoolToken();
+            const balance = yield borrowable.methods.borrowBalance(this.getAccountAddress()).call();
+            const storedAmount = yield yield this.poolToken.normalize(balance);
+            const accrualTimestamp = yield this.getAccrualTimestamp();
+            const borrowRate = yield this.getBorrowRate();
+            return storedAmount * (1 + (Date.now() / 1000 - accrualTimestamp) * borrowRate);
+        });
+    }
+    getBorrowed() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.borrowableCache.borrowed)
+                this.borrowableCache.borrowed = this.initializeBorrowed();
+            return this.borrowableCache.borrowed;
+        });
+    }
+    getBorrowedUSD() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const borrowed = yield this.getBorrowed();
+            const tokenPrice = yield this.getTokenPriceAccurate();
+            return borrowed * tokenPrice;
+        });
+    }
+    // Farming Shares
+    initializeFarmingShares() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.poolToken.hasImpermaxChef()))
+                return 0;
+            return (yield this.poolToken.getImpermaxChef().methods.userInfo(yield this.poolToken.getPoolTokenAddress(), this.getAccountAddress()).call()).shares;
+        });
+    }
+    getFarmingShares() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.borrowableCache.farmingShares)
+                this.borrowableCache.farmingShares = this.initializeFarmingShares();
+            return this.borrowableCache.farmingShares;
+        });
+    }
+    // Available Reward
+    initializeAvailableFarmingReward() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.poolToken.hasImpermaxChef()))
+                return 0;
+            const borrowableAddress = yield this.poolToken.getPoolTokenAddress();
+            try {
+                return (yield this.poolToken.getImpermaxChef().methods.pendingReward(borrowableAddress, this.getAccountAddress()).call()) / 1e18;
+            }
+            catch (_a) {
+                console.log("Warning: pending reward negative");
+                return 0;
+            }
+        });
+    }
+    getAvailableFarmingReward() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.borrowableCache.availableFarmingReward)
+                this.borrowableCache.availableFarmingReward = this.initializeAvailableFarmingReward();
+            return this.borrowableCache.availableFarmingReward;
+        });
+    }
+    initializeAvailableRewarderReward() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.poolToken.hasRewarder()))
+                return 0;
+            const borrowableAddress = yield this.poolToken.getPoolTokenAddress();
+            const rewarder = yield this.poolToken.getRewarder();
+            try {
+                return (yield rewarder.methods.pendingReward(borrowableAddress, this.getAccountAddress()).call()) / 1e18;
+            }
+            catch (_a) {
+                console.log("Warning: pending reward negative");
+                return 0;
+            }
+        });
+    }
+    getAvailableRewarderReward() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.borrowableCache.availableRewarderReward)
+                this.borrowableCache.availableRewarderReward = this.initializeAvailableRewarderReward();
+            return this.borrowableCache.availableRewarderReward;
+        });
+    }
+}
+exports.default = OnchainAccountBorrowable;

package/lib/onchain/account/lendingPool/onchainAccountBorrowableV2.d.ts

@@ -0,0 +1,10 @@
+import OnchainAccountBorrowable from "./onchainAccountBorrowable";
+import OnchainAccountLendingPoolV2 from "./onchainAccountLendingPoolV2";
+import { OnchainBorrowableV2 } from "../../impermaxFactory/lendingPool";
+export default class OnchainAccountBorrowableV2 extends OnchainAccountBorrowable {
+    protected readonly lendingPool: OnchainAccountLendingPoolV2;
+    protected readonly poolToken: OnchainBorrowableV2;
+    getLendingPool: () => OnchainAccountLendingPoolV2;
+    getPoolToken: () => OnchainBorrowableV2;
+    getMaxBorrowable(): Promise<number>;
+}

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

@@ -0,0 +1,55 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const types_1 = require("../../../config/types");
+const onchainAccountBorrowable_1 = __importDefault(require("./onchainAccountBorrowable"));
+class OnchainAccountBorrowableV2 extends onchainAccountBorrowable_1.default {
+    constructor() {
+        super(...arguments);
+        this.getLendingPool = () => this.lendingPool;
+        this.getPoolToken = () => this.poolToken;
+    }
+    // Max OffchainBorrowable
+    // binary search approach
+    getMaxBorrowable() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const availableCash = yield this.poolToken.getTotalBalance();
+            const twapPrice = yield this.lendingPool.getLendingPool().getTWAPPrice();
+            // start search
+            let borrowAmount = availableCash;
+            let borrowAmountPrev = 0;
+            let bestAmount = 0;
+            for (let i = 0; i < 1000; i++) {
+                const jump = Math.abs(borrowAmount - borrowAmountPrev) / 2;
+                if (jump / availableCash < 1e-9)
+                    break;
+                borrowAmountPrev = borrowAmount;
+                const changeCollateral = 0;
+                const changeBorrowedA = this.getBorrowableType() == types_1.Borrowable.A ? borrowAmount : 0;
+                const changeBorrowedB = this.getBorrowableType() == types_1.Borrowable.B ? borrowAmount : 0;
+                const changes = { changeCollateral, changeBorrowedA, changeBorrowedB };
+                const [liqPriceA, liqPriceB] = yield this.lendingPool.getLiquidationPrices(changes);
+                if (liqPriceA * this.getUiMargin() > twapPrice || liqPriceB / this.getUiMargin() < twapPrice)
+                    borrowAmount -= jump;
+                else {
+                    bestAmount = borrowAmount;
+                    borrowAmount += jump;
+                }
+            }
+            bestAmount = bestAmount > availableCash ? availableCash : bestAmount;
+            return bestAmount;
+        });
+    }
+}
+exports.default = OnchainAccountBorrowableV2;

package/lib/onchain/account/lendingPool/onchainAccountBorrowableV3.d.ts

@@ -0,0 +1,10 @@
+import OnchainAccountBorrowable from "./onchainAccountBorrowable";
+import { OnchainBorrowableV3 } from "../../impermaxFactory/lendingPool";
+import OnchainAccountLendingPoolV3 from "./onchainAccountLendingPoolV3";
+export default class OnchainAccountBorrowableV3 extends OnchainAccountBorrowable {
+    protected readonly lendingPool: OnchainAccountLendingPoolV3;
+    protected readonly poolToken: OnchainBorrowableV3;
+    getLendingPool: () => OnchainAccountLendingPoolV3;
+    getPoolToken: () => OnchainBorrowableV3;
+    getMaxBorrowable(): Promise<number>;
+}

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

@@ -0,0 +1,28 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const onchainAccountBorrowable_1 = __importDefault(require("./onchainAccountBorrowable"));
+class OnchainAccountBorrowableV3 extends onchainAccountBorrowable_1.default {
+    constructor() {
+        super(...arguments);
+        this.getLendingPool = () => this.lendingPool;
+        this.getPoolToken = () => this.poolToken;
+    }
+    getMaxBorrowable() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return 0;
+        });
+    }
+}
+exports.default = OnchainAccountBorrowableV3;

package/lib/onchain/account/lendingPool/onchainAccountCollateral.d.ts

@@ -1,23 +1,10 @@
-import OnchainAccountLendingPool from './index';
-import OnchainAccountPoolToken from '../onchainAccountPoolToken';
-import OnchainCollateral from '../../impermaxFactory/lendingPool/onchainCollateral';
-import OnchainInteractionsCollateral from '../../interactions/lendingPool/onchainInteractionsCollateral';
-import OffchainAccountCollateral from '../../../offchain/account/lendingPool/offchainAccountCollateral';
-export default class OnchainAccountCollateral extends OnchainAccountPoolToken {
-    private readonly lendingPool;
-    protected readonly poolToken: OnchainCollateral;
-    private collateralCache;
-    constructor(lendingPool: OnchainAccountLendingPool);
-    getLendingPool: () => OnchainAccountLendingPool;
-    getPoolToken: () => OnchainCollateral;
-    getAccount: () => import("..").default;
-    getInteractionsPoolToken(): OnchainInteractionsCollateral;
-    getInteractionsCollateral: () => OnchainInteractionsCollateral;
-    getOffchainAccountPoolToken(): Promise<OffchainAccountCollateral>;
-    getOffchainAccountCollateral: () => Promise<OffchainAccountCollateral>;
-    cleanCache(): void;
-    fixStakedLPExchangeRate(n: Promise<number>): Promise<number>;
-    getAvailableBalanceUSD(): Promise<number>;
-    getDepositedUSD(): Promise<number>;
-    getMaxWithdrawable(): Promise<number>;
-}
+import OnchainAccountLendingPool from './index';
+import OffchainAccountCollateral from '../../../offchain/account/lendingPool/offchainAccountCollateral';
+export default abstract class OnchainAccountCollateral {
+    abstract getLendingPool(): OnchainAccountLendingPool;
+    abstract cleanCache(): any;
+    getAccount: () => import("..").default;
+    getInteractionsCollateral(): import("../../..").OnchainInteractionsCollateral;
+    getOffchainAccountCollateral(): Promise<OffchainAccountCollateral>;
+    abstract getDepositedUSD(): Promise<number>;
+}

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

@@ -1,109 +1,26 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const onchainTypes_1 = require("../../onchainTypes");
-const onchainAccountPoolToken_1 = __importDefault(require("../onchainAccountPoolToken"));
-class OnchainAccountCollateral extends onchainAccountPoolToken_1.default {
-    constructor(lendingPool) {
-        super();
-        this.collateralCache = {};
-        this.getLendingPool = () => this.lendingPool;
-        this.getPoolToken = () => this.poolToken;
-        this.getAccount = () => this.lendingPool.getAccount();
-        this.getInteractionsCollateral = this.getInteractionsPoolToken;
-        this.getOffchainAccountCollateral = this.getOffchainAccountPoolToken;
-        this.lendingPool = lendingPool;
-        this.poolToken = lendingPool.getLendingPool().getCollateral();
-    }
-    getInteractionsPoolToken() {
-        return this.lendingPool.getInteractionsLendingPool().getCollateral();
-    }
-    getOffchainAccountPoolToken() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const offchainAccountLendingPool = yield this.lendingPool.getOffchainAccountLendingPool();
-            return offchainAccountLendingPool.getCollateral();
-        });
-    }
-    cleanCache() {
-        super.cleanCache();
-        this.collateralCache = {};
-    }
-    fixStakedLPExchangeRate(n) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stakedLPExchangeRate = yield this.poolToken.getLendingPool().getStakedLPExchangeRate();
-            return (yield n) / stakedLPExchangeRate;
-        });
-    }
-    getAvailableBalanceUSD() {
-        const _super = Object.create(null, {
-            getAvailableBalanceUSD: { get: () => super.getAvailableBalanceUSD }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.fixStakedLPExchangeRate(_super.getAvailableBalanceUSD.call(this));
-        });
-    }
-    getDepositedUSD() {
-        const _super = Object.create(null, {
-            getDepositedUSD: { get: () => super.getDepositedUSD }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.fixStakedLPExchangeRate(_super.getDepositedUSD.call(this));
-        });
-    }
-    // Max Withdrawable
-    /*public async getMaxWithdrawable() : Promise<number> {
-      const deposited = await this.getDeposited();
-      const availableCash = await this.poolToken.getTotalBalance();
-      const { valueCollateral, valueA, valueB } = await this.lendingPool.getValues(NO_CHANGES);
-      const safetyMargin = (await this.lendingPool.getSafetyMargin()) * this.getUiMargin();
-      const liquidationPenalty = await this.lendingPool.getLiquidationPenalty();
-      const actualCollateral = valueCollateral / liquidationPenalty;
-      const maxWithdrawable1 = (actualCollateral - (valueA + valueB * safetyMargin) / Math.sqrt(safetyMargin)) * liquidationPenalty / this.getDust();
-      const maxWithdrawable2 = (actualCollateral - (valueB + valueA * safetyMargin) / Math.sqrt(safetyMargin)) * liquidationPenalty / this.getDust();
-      return Math.max(0, Math.min(deposited, availableCash, maxWithdrawable1, maxWithdrawable2));
-    }*/
-    // binary search approach
-    getMaxWithdrawable() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const collateralAmount = yield this.getDeposited();
-            const twapPrice = yield this.lendingPool.getLendingPool().getTWAPPrice();
-            const [liqPriceA, liqPriceB] = yield this.lendingPool.getLiquidationPrices(onchainTypes_1.NO_CHANGES);
-            // start search
-            let withdrawAmount = collateralAmount;
-            let withdrawAmountPrev = 0;
-            let bestAmount = 0;
-            for (let i = 0; i < 1000; i++) {
-                const jump = Math.abs(withdrawAmount - withdrawAmountPrev) / 2;
-                if (jump / collateralAmount < 0.000001)
-                    break;
-                withdrawAmountPrev = withdrawAmount;
-                const changeCollateral = -1 * Math.min(withdrawAmount, collateralAmount);
-                const changeBorrowedA = 0;
-                const changeBorrowedB = 0;
-                const changes = { changeCollateral, changeBorrowedA, changeBorrowedB };
-                const [liqPriceA, liqPriceB] = yield this.lendingPool.getLiquidationPrices(changes);
-                if (liqPriceA * this.getUiMargin() > twapPrice || liqPriceB / this.getUiMargin() < twapPrice)
-                    withdrawAmount -= jump;
-                else {
-                    bestAmount = withdrawAmount;
-                    withdrawAmount += jump;
-                    if (withdrawAmount > collateralAmount)
-                        break;
-                }
-            }
-            return bestAmount * this.getDust();
-        });
-    }
-}
-exports.default = OnchainAccountCollateral;
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+class OnchainAccountCollateral {
+    constructor() {
+        this.getAccount = () => this.getLendingPool().getAccount();
+    }
+    getInteractionsCollateral() {
+        return this.getLendingPool().getInteractionsLendingPool().getCollateral();
+    }
+    getOffchainAccountCollateral() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const offchainAccountLendingPool = yield this.getLendingPool().getOffchainAccountLendingPool();
+            return offchainAccountLendingPool.getCollateral();
+        });
+    }
+}
+exports.default = OnchainAccountCollateral;

package/lib/onchain/account/lendingPool/onchainAccountCollateralV2.d.ts

@@ -0,0 +1,25 @@
+import OnchainAccountPoolToken from '../onchainAccountPoolToken';
+import OffchainAccountCollateral from '../../../offchain/account/lendingPool/offchainAccountCollateral';
+import OnchainAccountCollateral from "./onchainAccountCollateral";
+import { OnchainCollateralV2 } from "../../impermaxFactory/lendingPool";
+import OnchainAccountLendingPoolV2 from "./onchainAccountLendingPoolV2";
+import OnchainInteractionsCollateralV2 from "../../interactions/lendingPool/onchainInteractionsCollateralV2";
+export default class OnchainAccountCollateralV2 extends OnchainAccountPoolToken implements OnchainAccountCollateral {
+    protected readonly lendingPool: OnchainAccountLendingPoolV2;
+    protected readonly poolToken: OnchainCollateralV2;
+    protected collateralCache: {};
+    constructor(lendingPool: OnchainAccountLendingPoolV2);
+    getLendingPool: () => OnchainAccountLendingPoolV2;
+    getPoolToken: () => OnchainCollateralV2;
+    getCollateral: () => OnchainCollateralV2;
+    getAccount: () => import("..").default;
+    getInteractionsPoolToken(): OnchainInteractionsCollateralV2;
+    getInteractionsCollateral: () => OnchainInteractionsCollateralV2;
+    getOffchainAccountPoolToken(): Promise<OffchainAccountCollateral>;
+    getOffchainAccountCollateral: () => Promise<OffchainAccountCollateral>;
+    cleanCache(): void;
+    fixStakedLPExchangeRate(n: Promise<number>): Promise<number>;
+    getAvailableBalanceUSD(): Promise<number>;
+    getDepositedUSD(): Promise<number>;
+    getMaxWithdrawable(): Promise<number>;
+}