impermax-sdk 1.2.112 → 2.1.0

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

@@ -1,12 +1,49 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OnchainAccountCollateral = exports.OnchainAccountBorrowable = void 0;
+exports.OnchainAccountCollateralV3 = exports.OnchainAccountBorrowableV3 = exports.OnchainAccountLendingPoolV3 = exports.OnchainAccountCollateralV2 = exports.OnchainAccountBorrowableV2 = exports.OnchainAccountLendingPoolV2 = exports.OnchainAccountCollateral = exports.OnchainAccountBorrowable = exports.nftlp = void 0;
+const nftlp = __importStar(require("./nftlp"));
+exports.nftlp = nftlp;
 const onchainAccountBorrowable_1 = __importDefault(require("./onchainAccountBorrowable"));
 exports.OnchainAccountBorrowable = onchainAccountBorrowable_1.default;
+const onchainAccountBorrowableV2_1 = __importDefault(require("./onchainAccountBorrowableV2"));
+exports.OnchainAccountBorrowableV2 = onchainAccountBorrowableV2_1.default;
+const onchainAccountBorrowableV3_1 = __importDefault(require("./onchainAccountBorrowableV3"));
+exports.OnchainAccountBorrowableV3 = onchainAccountBorrowableV3_1.default;
 const onchainAccountCollateral_1 = __importDefault(require("./onchainAccountCollateral"));
 exports.OnchainAccountCollateral = onchainAccountCollateral_1.default;
+const onchainAccountCollateralV2_1 = __importDefault(require("./onchainAccountCollateralV2"));
+exports.OnchainAccountCollateralV2 = onchainAccountCollateralV2_1.default;
+const onchainAccountCollateralV3_1 = __importDefault(require("./onchainAccountCollateralV3"));
+exports.OnchainAccountCollateralV3 = onchainAccountCollateralV3_1.default;
 const onchainAccountLendingPool_1 = __importDefault(require("./onchainAccountLendingPool"));
+const onchainAccountLendingPoolV2_1 = __importDefault(require("./onchainAccountLendingPoolV2"));
+exports.OnchainAccountLendingPoolV2 = onchainAccountLendingPoolV2_1.default;
+const onchainAccountLendingPoolV3_1 = __importDefault(require("./onchainAccountLendingPoolV3"));
+exports.OnchainAccountLendingPoolV3 = onchainAccountLendingPoolV3_1.default;
 exports.default = onchainAccountLendingPool_1.default;

package/lib/onchain/account/lendingPool/nftlp/index.d.ts

@@ -0,0 +1,4 @@
+import OnchainAccountNftlp from './onchainAccountNftlp';
+import OnchainAccountNftlpUniswapV3 from './onchainAccountNftlpUniswapV3';
+export { OnchainAccountNftlp, OnchainAccountNftlpUniswapV3, };
+export default OnchainAccountNftlp;

package/lib/onchain/account/lendingPool/nftlp/index.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OnchainAccountNftlpUniswapV3 = exports.OnchainAccountNftlp = void 0;
+const onchainAccountNftlp_1 = __importDefault(require("./onchainAccountNftlp"));
+exports.OnchainAccountNftlp = onchainAccountNftlp_1.default;
+const onchainAccountNftlpUniswapV3_1 = __importDefault(require("./onchainAccountNftlpUniswapV3"));
+exports.OnchainAccountNftlpUniswapV3 = onchainAccountNftlpUniswapV3_1.default;
+exports.default = onchainAccountNftlp_1.default;

package/lib/onchain/account/lendingPool/nftlp/onchainAccountNftlp.d.ts

@@ -0,0 +1,7 @@
+import OnchainAccountLendingPoolV3 from "../onchainAccountLendingPoolV3";
+export default abstract class OnchainAccountNftlp {
+    protected readonly lendingPool: OnchainAccountLendingPoolV3;
+    protected cache: {};
+    constructor(lendingPool: OnchainAccountLendingPoolV3);
+    cleanCache(): void;
+}

package/lib/onchain/account/lendingPool/nftlp/onchainAccountNftlp.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class OnchainAccountNftlp {
+    constructor(lendingPool) {
+        this.cache = {};
+        this.lendingPool = lendingPool;
+    }
+    cleanCache() {
+        this.cache = {};
+    }
+}
+exports.default = OnchainAccountNftlp;

package/lib/onchain/account/lendingPool/nftlp/onchainAccountNftlpUniswapV3.d.ts

@@ -0,0 +1,4 @@
+import OnchainAccountNftlp from "./onchainAccountNftlp";
+export default class OnchainAccountNftlpUniswapV3 extends OnchainAccountNftlp {
+    protected cache: {};
+}

package/lib/onchain/account/lendingPool/nftlp/onchainAccountNftlpUniswapV3.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const onchainAccountNftlp_1 = __importDefault(require("./onchainAccountNftlp"));
+class OnchainAccountNftlpUniswapV3 extends onchainAccountNftlp_1.default {
+    constructor() {
+        super(...arguments);
+        this.cache = {};
+    }
+}
+exports.default = OnchainAccountNftlpUniswapV3;

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

@@ -1,14 +1,19 @@
-import { PoolTokenType } from '../../../config/types';
+import { Borrowable } from '../../../config/types';
 import OnchainAccountLendingPool from './index';
 import OnchainAccountPoolToken from '../onchainAccountPoolToken';
 import OnchainBorrowable from '../../impermaxFactory/lendingPool/onchainBorrowable';
 import OnchainInteractionsBorrowable from '../../interactions/lendingPool/onchainInteractionsBorrowable';
 import OffchainAccountBorrowable from '../../../offchain/account/lendingPool/offchainAccountBorrowable';
-export default class OnchainAccountBorrowable extends OnchainAccountPoolToken {
-    private readonly lendingPool;
+export default abstract class OnchainAccountBorrowable extends OnchainAccountPoolToken {
+    protected readonly lendingPool: OnchainAccountLendingPool;
     protected readonly poolToken: OnchainBorrowable;
-    private borrowableCache;
-    constructor(lendingPool: OnchainAccountLendingPool, poolTokenType: PoolTokenType);
+    protected borrowableCache: {
+        borrowed?: Promise<number>;
+        farmingShares?: Promise<number>;
+        availableFarmingReward?: Promise<number>;
+        availableRewarderReward?: Promise<number>;
+    };
+    constructor(lendingPool: OnchainAccountLendingPool, borrowable: Borrowable);
     getLendingPool: () => OnchainAccountLendingPool;
     getPoolToken: () => OnchainBorrowable;
     getAccount: () => import("..").default;
@@ -17,14 +22,14 @@ export default class OnchainAccountBorrowable extends OnchainAccountPoolToken {
     getOffchainAccountPoolToken(): Promise<OffchainAccountBorrowable>;
     getOffchainAccountBorrowable: () => Promise<OffchainAccountBorrowable>;
     cleanCache(): void;
-    private getPoolTokenType;
+    protected getBorrowableType: () => Borrowable;
     getSupplyAPR: () => Promise<number>;
     getBorrowRate: () => Promise<number>;
     getAccrualTimestamp: () => Promise<number>;
     private initializeBorrowed;
     getBorrowed(): Promise<number>;
     getBorrowedUSD(): Promise<number>;
-    getMaxBorrowable(): Promise<number>;
+    abstract getMaxBorrowable(): Promise<number>;
     private initializeFarmingShares;
     getFarmingShares(): Promise<number>;
     private initializeAvailableFarmingReward;

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

@@ -12,10 +12,9 @@ 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) {
+    constructor(lendingPool, borrowable) {
         super();
         this.borrowableCache = {};
         this.getLendingPool = () => this.lendingPool;
@@ -24,20 +23,20 @@ class OnchainAccountBorrowable extends onchainAccountPoolToken_1.default {
         this.getInteractionsBorrowable = this.getInteractionsPoolToken;
         this.getOffchainAccountBorrowable = this.getOffchainAccountPoolToken;
         // Shortcuts
-        this.getPoolTokenType = () => this.poolToken.getPoolTokenType();
+        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().getPoolToken(poolTokenType);
+        this.poolToken = lendingPool.getLendingPool().getBorrowable(borrowable);
     }
     getInteractionsPoolToken() {
-        return this.lendingPool.getInteractionsLendingPool().getPoolToken(this.getPoolTokenType());
+        return this.lendingPool.getInteractionsLendingPool().getBorrowable(this.getBorrowableType());
     }
     getOffchainAccountPoolToken() {
         return __awaiter(this, void 0, void 0, function* () {
             const offchainAccountLendingPool = yield this.lendingPool.getOffchainAccountLendingPool();
-            return offchainAccountLendingPool.getPoolToken(this.getPoolTokenType());
+            return offchainAccountLendingPool.getBorrowable(this.getBorrowableType());
         });
     }
     cleanCache() {
@@ -69,50 +68,6 @@ class OnchainAccountBorrowable extends onchainAccountPoolToken_1.default {
             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* () {

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;
+export default abstract class OnchainAccountCollateral {
+    abstract getLendingPool(): OnchainAccountLendingPool;
+    abstract cleanCache(): any;
     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>;
+    getInteractionsCollateral(): import("../../..").OnchainInteractionsCollateral;
+    getOffchainAccountCollateral(): Promise<OffchainAccountCollateral>;
+    abstract getDepositedUSD(): Promise<number>;
 }

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

@@ -8,102 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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();
+class OnchainAccountCollateral {
+    constructor() {
+        this.getAccount = () => this.getLendingPool().getAccount();
     }
-    getInteractionsPoolToken() {
-        return this.lendingPool.getInteractionsLendingPool().getCollateral();
+    getInteractionsCollateral() {
+        return this.getLendingPool().getInteractionsLendingPool().getCollateral();
     }
-    getOffchainAccountPoolToken() {
+    getOffchainAccountCollateral() {
         return __awaiter(this, void 0, void 0, function* () {
-            const offchainAccountLendingPool = yield this.lendingPool.getOffchainAccountLendingPool();
+            const offchainAccountLendingPool = yield this.getLendingPool().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;

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>;
+}

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

@@ -0,0 +1,99 @@
+"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 OnchainAccountCollateralV2 extends onchainAccountPoolToken_1.default {
+    constructor(lendingPool) {
+        super();
+        this.collateralCache = {};
+        this.getLendingPool = () => this.lendingPool;
+        this.getPoolToken = () => this.poolToken;
+        this.getCollateral = () => 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
+    // 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 = OnchainAccountCollateralV2;

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

@@ -0,0 +1,18 @@
+import OffchainAccountCollateral from '../../../offchain/account/lendingPool/offchainAccountCollateral';
+import OnchainAccountCollateral from "./onchainAccountCollateral";
+import { OnchainCollateralV3 } from "../../impermaxFactory/lendingPool";
+import OnchainAccountLendingPoolV3 from "./onchainAccountLendingPoolV3";
+import { OnchainInteractionsCollateralV3 } from "../../interactions/lendingPool";
+export default class OnchainAccountCollateralV3 extends OnchainAccountCollateral {
+    protected readonly lendingPool: OnchainAccountLendingPoolV3;
+    protected readonly collateral: OnchainCollateralV3;
+    protected collateralCache: {};
+    constructor(lendingPool: OnchainAccountLendingPoolV3);
+    getLendingPool: () => OnchainAccountLendingPoolV3;
+    getCollateral: () => OnchainCollateralV3;
+    getAccount: () => import("..").default;
+    getInteractionsCollateral(): OnchainInteractionsCollateralV3;
+    getOffchainAccountCollateral(): Promise<OffchainAccountCollateral>;
+    cleanCache(): void;
+    getDepositedUSD(): Promise<number>;
+}