impermax-sdk 1.2.112 → 2.1.0

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPool.d.ts

@@ -1,46 +1,31 @@
 import OnchainInteractions from '../index';
-import { PoolTokenType } from '../../../config/types';
+import { Borrowable } from '../../../config/types';
 import OnchainInteractionsCollateral from './onchainInteractionsCollateral';
 import OnchainInteractionsBorrowable from './onchainInteractionsBorrowable';
-import { PermitData } from '../../onchainTypes';
-import { BigNumber } from 'ethers';
-import OnchainInteractionsPoolToken from '../onchainInteractionsPoolToken';
 import OnchainLendingPool from '../../impermaxFactory/lendingPool';
 import OnchainAccountLendingPool from '../../account/lendingPool';
-export default class OnchainInteractionsLendingPool {
-    private readonly interactions;
-    private readonly lendingPool;
-    private readonly poolTokens;
+export default abstract class OnchainInteractionsLendingPool {
+    protected readonly interactions: OnchainInteractions;
+    protected readonly lendingPool: OnchainLendingPool;
+    protected readonly collateral: OnchainInteractionsCollateral;
+    protected readonly borrowables: {
+        [Borrowable.A]: OnchainInteractionsBorrowable;
+        [Borrowable.B]: OnchainInteractionsBorrowable;
+    };
+    protected abstract getNewCollateralObject(): OnchainInteractionsCollateral;
+    protected abstract getNewBorrowableObject(borrowable: Borrowable): OnchainInteractionsBorrowable;
     constructor(interactions: OnchainInteractions, lendingPool: OnchainLendingPool);
     getInteractions: () => OnchainInteractions;
     getLendingPool: () => OnchainLendingPool;
-    getPoolToken(poolTokenType: PoolTokenType): OnchainInteractionsPoolToken;
-    getAccountLendingPool(): OnchainAccountLendingPool;
+    getBorrowable: (borrowable: Borrowable) => OnchainInteractionsBorrowable;
     getBorrowableA: () => OnchainInteractionsBorrowable;
     getBorrowableB: () => OnchainInteractionsBorrowable;
     getCollateral: () => OnchainInteractionsCollateral;
-    private getFactory;
-    private getPairAddress;
-    getRouterContract: () => any;
+    protected getFactory: () => import("../../../config/types").Factory;
+    protected getId: () => string;
+    getPoolTokenRouter: () => any;
     getAccountAddress: () => string;
+    getAccountLendingPool(): OnchainAccountLendingPool;
     send: (method: any, onTransactionHash: Function) => Promise<any>;
-    getLeverageAmounts(leverage: number, slippage: number): Promise<{
-        bAmountA: number;
-        bAmountB: number;
-        cAmount: number;
-        bAmountAMin: number;
-        bAmountBMin: number;
-        cAmountMin: number;
-    }>;
-    leverage(amountA: BigNumber, amountB: BigNumber, amountAMin: BigNumber, amountBMin: BigNumber, permitDataA: PermitData, permitDataB: PermitData, onTransactionHash: Function): Promise<any>;
-    getDeleverageAmounts(changeCollateralValue: number, slippage: number): Promise<{
-        bAmountA: number;
-        bAmountB: number;
-        cAmount: number;
-        bAmountAMin: number;
-        bAmountBMin: number;
-    }>;
-    deleverage(tokens: BigNumber, amountAMin: BigNumber, amountBMin: BigNumber, permitData: PermitData, onTransactionHash: Function): Promise<any>;
     trackBorrows(onTransactionHash: Function): Promise<any>;
-    reinvest(onTransactionHash: Function): Promise<any>;
 }

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPool.js

@@ -8,108 +8,32 @@ 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 types_1 = require("../../../config/types");
-const onchainInteractionsCollateral_1 = __importDefault(require("./onchainInteractionsCollateral"));
-const onchainInteractionsBorrowable_1 = __importDefault(require("./onchainInteractionsBorrowable"));
-const utils_1 = require("../../../utils");
-const general_1 = require("../../../config/general");
 class OnchainInteractionsLendingPool {
     constructor(interactions, lendingPool) {
+        // Shortcuts
         this.getInteractions = () => this.interactions;
         this.getLendingPool = () => this.lendingPool;
-        // Shortcuts
-        this.getBorrowableA = () => this.poolTokens[types_1.PoolTokenType.BorrowableA];
-        this.getBorrowableB = () => this.poolTokens[types_1.PoolTokenType.BorrowableB];
-        this.getCollateral = () => this.poolTokens[types_1.PoolTokenType.Collateral];
+        this.getBorrowable = (borrowable) => this.borrowables[borrowable];
+        this.getBorrowableA = () => this.getBorrowable(types_1.Borrowable.A);
+        this.getBorrowableB = () => this.getBorrowable(types_1.Borrowable.B);
+        this.getCollateral = () => this.collateral;
         this.getFactory = () => this.lendingPool.getImpermaxFactory().getFactory();
-        this.getPairAddress = () => this.lendingPool.getPairAddress();
-        this.getRouterContract = () => this.lendingPool.getImpermaxFactory().getRouter();
+        this.getId = () => this.lendingPool.getId();
+        this.getPoolTokenRouter = () => this.lendingPool.getImpermaxFactory().getPoolTokenRouter();
         this.getAccountAddress = () => this.interactions.getAccountAddress();
         this.send = (method, onTransactionHash) => this.interactions.send(method, onTransactionHash);
         this.interactions = interactions;
         this.lendingPool = lendingPool;
-        this.poolTokens = {
-            [types_1.PoolTokenType.Collateral]: new onchainInteractionsCollateral_1.default(this),
-            [types_1.PoolTokenType.BorrowableA]: new onchainInteractionsBorrowable_1.default(this, types_1.PoolTokenType.BorrowableA),
-            [types_1.PoolTokenType.BorrowableB]: new onchainInteractionsBorrowable_1.default(this, types_1.PoolTokenType.BorrowableB),
+        this.collateral = this.getNewCollateralObject();
+        this.borrowables = {
+            [types_1.Borrowable.A]: this.getNewBorrowableObject(types_1.Borrowable.A),
+            [types_1.Borrowable.B]: this.getNewBorrowableObject(types_1.Borrowable.B),
         };
     }
-    getPoolToken(poolTokenType) {
-        return this.poolTokens[poolTokenType];
-    }
     getAccountLendingPool() {
-        return this.interactions.getAccount().getLendingPool(this.getFactory(), this.getPairAddress());
-    }
-    getLeverageAmounts(leverage, slippage) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [priceA, priceB] = yield this.lendingPool.getMarketPriceDenomLP();
-            // This function must use the market price, but the account leverage is calculated with the TWAP, so we need an adjustFactor
-            const [priceATWAP, priceBTWAP] = yield this.lendingPool.getPriceDenomLP();
-            const diff = priceA > priceATWAP ? priceA / priceATWAP : priceATWAP / priceA;
-            const adjustFactor = Math.pow((0, utils_1.impermanentLoss)(Math.pow(diff, 2)), leverage);
-            const accountLendingPool = yield this.getAccountLendingPool();
-            const currentLeverage = yield accountLendingPool.getLeverage();
-            const collateralValue = yield accountLendingPool.getCollateral().getDeposited();
-            const changeCollateralValue = (collateralValue * leverage / currentLeverage - collateralValue) * adjustFactor;
-            const [reservesWeightA, reservesWeightB] = yield this.lendingPool.getMarketReservesWeights();
-            const changeValueA = changeCollateralValue * reservesWeightA;
-            const changeValueB = changeCollateralValue * reservesWeightB;
-            const bAmountA = priceA > 0 ? changeValueA / priceA : 0;
-            const bAmountB = priceB > 0 ? changeValueB / priceB : 0;
-            const cAmount = changeCollateralValue ? changeCollateralValue : 0;
-            return {
-                bAmountA: bAmountA,
-                bAmountB: bAmountB,
-                cAmount: cAmount,
-                bAmountAMin: bAmountA / slippage,
-                bAmountBMin: bAmountB / slippage,
-                cAmountMin: cAmount / Math.sqrt(slippage),
-            };
-        });
-    }
-    leverage(amountA, amountB, amountAMin, amountBMin, permitDataA, permitDataB, onTransactionHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const router = this.getRouterContract();
-            const dataA = permitDataA ? permitDataA.permitData : '0x';
-            const dataB = permitDataB ? permitDataB.permitData : '0x';
-            if (permitDataA && permitDataB && !permitDataA.deadline.eq(permitDataB.deadline))
-                return console.error("Permits deadline are not equal");
-            const deadline = permitDataA ? permitDataA.deadline : permitDataB ? permitDataB.deadline : general_1.DEADLINE;
-            const pairAddress = this.getPairAddress();
-            const account = this.getAccountAddress();
-            return this.send(router.methods.leverage(pairAddress, amountA, amountB, amountAMin, amountBMin, account, deadline, dataA, dataB), onTransactionHash);
-        });
-    }
-    getDeleverageAmounts(changeCollateralValue, slippage) {
-        return __awaiter(this, void 0, void 0, function* () {
-            changeCollateralValue = changeCollateralValue !== null && changeCollateralValue !== void 0 ? changeCollateralValue : 0;
-            const [priceA, priceB] = yield this.lendingPool.getMarketPriceDenomLP();
-            const [reservesWeightA, reservesWeightB] = yield this.lendingPool.getMarketReservesWeights();
-            const changeValueA = changeCollateralValue * reservesWeightA;
-            const changeValueB = changeCollateralValue * reservesWeightB;
-            const bAmountA = priceA > 0 ? changeValueA / priceA : 0;
-            const bAmountB = priceB > 0 ? changeValueB / priceB : 0;
-            return {
-                bAmountA: bAmountA,
-                bAmountB: bAmountB,
-                cAmount: changeCollateralValue,
-                bAmountAMin: bAmountA / Math.sqrt(slippage),
-                bAmountBMin: bAmountB / Math.sqrt(slippage),
-            };
-        });
-    }
-    deleverage(tokens, amountAMin, amountBMin, permitData, onTransactionHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const router = this.getRouterContract();
-            const data = permitData ? permitData.permitData : '0x';
-            const deadline = permitData ? permitData.deadline : general_1.DEADLINE;
-            const pairAddress = this.getPairAddress();
-            return this.send(router.methods.deleverage(pairAddress, tokens, amountAMin, amountBMin, deadline, data), onTransactionHash);
-        });
+        return this.interactions.getAccount().getLendingPool(this.getFactory(), this.getId());
     }
     trackBorrows(onTransactionHash) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -125,11 +49,5 @@ class OnchainInteractionsLendingPool {
             return this.send(claimAggregator.methods.trackBorrows(account, toTrack), onTransactionHash);
         });
     }
-    reinvest(onTransactionHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stakedLPToken = yield this.lendingPool.getStakedLPToken();
-            return this.send(stakedLPToken.methods.reinvest(), onTransactionHash);
-        });
-    }
 }
 exports.default = OnchainInteractionsLendingPool;

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPoolV2.d.ts

@@ -0,0 +1,42 @@
+import { Borrowable } from '../../../config/types';
+import { PermitData } from '../../onchainTypes';
+import { BigNumber } from 'ethers';
+import { OnchainLendingPoolV2 } from '../../impermaxFactory/lendingPool';
+import { OnchainAccountLendingPoolV2 } from '../../account/lendingPool';
+import OnchainInteractionsLendingPool from "./onchainInteractionsLendingPool";
+import OnchainInteractionsCollateralV2 from "./onchainInteractionsCollateralV2";
+import OnchainInteractionsBorrowableV2 from "./onchainInteractionsBorrowableV2";
+export default class OnchainInteractionsLendingPoolV2 extends OnchainInteractionsLendingPool {
+    protected readonly lendingPool: OnchainLendingPoolV2;
+    protected readonly collateral: OnchainInteractionsCollateralV2;
+    protected readonly borrowables: {
+        [Borrowable.A]: OnchainInteractionsBorrowableV2;
+        [Borrowable.B]: OnchainInteractionsBorrowableV2;
+    };
+    protected getNewCollateralObject(): OnchainInteractionsCollateralV2;
+    protected getNewBorrowableObject(borrowable: Borrowable): OnchainInteractionsBorrowableV2;
+    getLendingPool: () => OnchainLendingPoolV2;
+    getBorrowable: (borrowable: Borrowable) => OnchainInteractionsBorrowableV2;
+    getBorrowableA: () => OnchainInteractionsBorrowableV2;
+    getBorrowableB: () => OnchainInteractionsBorrowableV2;
+    getCollateral: () => OnchainInteractionsCollateralV2;
+    getAccountLendingPool(): OnchainAccountLendingPoolV2;
+    getLeverageAmounts(leverage: number, slippage: number): Promise<{
+        bAmountA: number;
+        bAmountB: number;
+        cAmount: number;
+        bAmountAMin: number;
+        bAmountBMin: number;
+        cAmountMin: number;
+    }>;
+    leverage(amountA: BigNumber, amountB: BigNumber, amountAMin: BigNumber, amountBMin: BigNumber, permitDataA: PermitData, permitDataB: PermitData, onTransactionHash: Function): Promise<any>;
+    getDeleverageAmounts(changeCollateralValue: number, slippage: number): Promise<{
+        bAmountA: number;
+        bAmountB: number;
+        cAmount: number;
+        bAmountAMin: number;
+        bAmountBMin: number;
+    }>;
+    deleverage(tokens: BigNumber, amountAMin: BigNumber, amountBMin: BigNumber, permitData: PermitData, onTransactionHash: Function): Promise<any>;
+    reinvest(onTransactionHash: Function): Promise<any>;
+}

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPoolV2.js

@@ -0,0 +1,114 @@
+"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 utils_1 = require("../../../utils");
+const general_1 = require("../../../config/general");
+const onchainInteractionsLendingPool_1 = __importDefault(require("./onchainInteractionsLendingPool"));
+const onchainInteractionsCollateralV2_1 = __importDefault(require("./onchainInteractionsCollateralV2"));
+const onchainInteractionsBorrowableV2_1 = __importDefault(require("./onchainInteractionsBorrowableV2"));
+class OnchainInteractionsLendingPoolV2 extends onchainInteractionsLendingPool_1.default {
+    constructor() {
+        super(...arguments);
+        // Shortcuts
+        this.getLendingPool = () => this.lendingPool;
+        this.getBorrowable = (borrowable) => this.borrowables[borrowable];
+        this.getBorrowableA = () => this.getBorrowable(types_1.Borrowable.A);
+        this.getBorrowableB = () => this.getBorrowable(types_1.Borrowable.B);
+        this.getCollateral = () => this.collateral;
+    }
+    getNewCollateralObject() {
+        return new onchainInteractionsCollateralV2_1.default(this);
+    }
+    getNewBorrowableObject(borrowable) {
+        return new onchainInteractionsBorrowableV2_1.default(this, borrowable);
+    }
+    getAccountLendingPool() {
+        return this.interactions.getAccount().getLendingPool(this.getFactory(), this.getId());
+    }
+    getLeverageAmounts(leverage, slippage) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [priceA, priceB] = yield this.lendingPool.getMarketPriceDenomLP();
+            // This function must use the market price, but the account leverage is calculated with the TWAP, so we need an adjustFactor
+            const [priceATWAP, priceBTWAP] = yield this.lendingPool.getPriceDenomLP();
+            const diff = priceA > priceATWAP ? priceA / priceATWAP : priceATWAP / priceA;
+            const adjustFactor = Math.pow((0, utils_1.impermanentLoss)(Math.pow(diff, 2)), leverage);
+            const accountLendingPool = yield this.getAccountLendingPool();
+            const currentLeverage = yield accountLendingPool.getLeverage();
+            const collateralValue = yield accountLendingPool.getCollateral().getDeposited();
+            const changeCollateralValue = (collateralValue * leverage / currentLeverage - collateralValue) * adjustFactor;
+            const [reservesWeightA, reservesWeightB] = yield this.lendingPool.getMarketReservesWeights();
+            const changeValueA = changeCollateralValue * reservesWeightA;
+            const changeValueB = changeCollateralValue * reservesWeightB;
+            const bAmountA = priceA > 0 ? changeValueA / priceA : 0;
+            const bAmountB = priceB > 0 ? changeValueB / priceB : 0;
+            const cAmount = changeCollateralValue ? changeCollateralValue : 0;
+            return {
+                bAmountA: bAmountA,
+                bAmountB: bAmountB,
+                cAmount: cAmount,
+                bAmountAMin: bAmountA / slippage,
+                bAmountBMin: bAmountB / slippage,
+                cAmountMin: cAmount / Math.sqrt(slippage),
+            };
+        });
+    }
+    leverage(amountA, amountB, amountAMin, amountBMin, permitDataA, permitDataB, onTransactionHash) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const router = this.getPoolTokenRouter();
+            const dataA = permitDataA ? permitDataA.permitData : '0x';
+            const dataB = permitDataB ? permitDataB.permitData : '0x';
+            if (permitDataA && permitDataB && !permitDataA.deadline.eq(permitDataB.deadline))
+                return console.error("Permits deadline are not equal");
+            const deadline = permitDataA ? permitDataA.deadline : permitDataB ? permitDataB.deadline : general_1.DEADLINE;
+            const pairAddress = this.getId();
+            const account = this.getAccountAddress();
+            return this.send(router.methods.leverage(pairAddress, amountA, amountB, amountAMin, amountBMin, account, deadline, dataA, dataB), onTransactionHash);
+        });
+    }
+    getDeleverageAmounts(changeCollateralValue, slippage) {
+        return __awaiter(this, void 0, void 0, function* () {
+            changeCollateralValue = changeCollateralValue !== null && changeCollateralValue !== void 0 ? changeCollateralValue : 0;
+            const [priceA, priceB] = yield this.lendingPool.getMarketPriceDenomLP();
+            const [reservesWeightA, reservesWeightB] = yield this.lendingPool.getMarketReservesWeights();
+            const changeValueA = changeCollateralValue * reservesWeightA;
+            const changeValueB = changeCollateralValue * reservesWeightB;
+            const bAmountA = priceA > 0 ? changeValueA / priceA : 0;
+            const bAmountB = priceB > 0 ? changeValueB / priceB : 0;
+            return {
+                bAmountA: bAmountA,
+                bAmountB: bAmountB,
+                cAmount: changeCollateralValue,
+                bAmountAMin: bAmountA / Math.sqrt(slippage),
+                bAmountBMin: bAmountB / Math.sqrt(slippage),
+            };
+        });
+    }
+    deleverage(tokens, amountAMin, amountBMin, permitData, onTransactionHash) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const router = this.getPoolTokenRouter();
+            const data = permitData ? permitData.permitData : '0x';
+            const deadline = permitData ? permitData.deadline : general_1.DEADLINE;
+            const pairAddress = this.getId();
+            return this.send(router.methods.deleverage(pairAddress, tokens, amountAMin, amountBMin, deadline, data), onTransactionHash);
+        });
+    }
+    reinvest(onTransactionHash) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const stakedLPToken = yield this.lendingPool.getStakedLPToken();
+            return this.send(stakedLPToken.methods.reinvest(), onTransactionHash);
+        });
+    }
+}
+exports.default = OnchainInteractionsLendingPoolV2;

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPoolV3.d.ts

@@ -0,0 +1,27 @@
+import { Borrowable } from '../../../config/types';
+import { OnchainLendingPoolV3 } from '../../impermaxFactory/lendingPool';
+import { OnchainAccountLendingPoolV3 } from '../../account/lendingPool';
+import OnchainInteractionsLendingPool from "./onchainInteractionsLendingPool";
+import OnchainInteractionsBorrowableV3 from "./onchainInteractionsBorrowableV3";
+import OnchainInteractionsCollateralV3 from './onchainInteractionsCollateralV3';
+import OnchainInteractions from "../index";
+import OnchainInteractionsNftlp from "./nftlp";
+export default class OnchainInteractionsLendingPoolV3 extends OnchainInteractionsLendingPool {
+    protected readonly lendingPool: OnchainLendingPoolV3;
+    protected readonly collateral: OnchainInteractionsCollateralV3;
+    protected readonly borrowables: {
+        [Borrowable.A]: OnchainInteractionsBorrowableV3;
+        [Borrowable.B]: OnchainInteractionsBorrowableV3;
+    };
+    protected readonly nftlp: OnchainInteractionsNftlp;
+    constructor(interactions: OnchainInteractions, lendingPool: OnchainLendingPoolV3);
+    protected getNewCollateralObject(): OnchainInteractionsCollateralV3;
+    protected getNewBorrowableObject(borrowable: Borrowable): OnchainInteractionsBorrowableV3;
+    getLendingPool: () => OnchainLendingPoolV3;
+    getBorrowable: (borrowable: Borrowable) => OnchainInteractionsBorrowableV3;
+    getBorrowableA: () => OnchainInteractionsBorrowableV3;
+    getBorrowableB: () => OnchainInteractionsBorrowableV3;
+    getCollateral: () => OnchainInteractionsCollateralV3;
+    getNftlp: () => OnchainInteractionsNftlp;
+    getAccountLendingPool(): OnchainAccountLendingPoolV3;
+}

package/lib/onchain/interactions/lendingPool/onchainInteractionsLendingPoolV3.js

@@ -0,0 +1,32 @@
+"use strict";
+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 onchainInteractionsLendingPool_1 = __importDefault(require("./onchainInteractionsLendingPool"));
+const onchainInteractionsBorrowableV3_1 = __importDefault(require("./onchainInteractionsBorrowableV3"));
+const onchainInteractionsCollateralV3_1 = __importDefault(require("./onchainInteractionsCollateralV3"));
+class OnchainInteractionsLendingPoolV3 extends onchainInteractionsLendingPool_1.default {
+    constructor(interactions, lendingPool) {
+        super(interactions, lendingPool);
+        // Shortcuts
+        this.getLendingPool = () => this.lendingPool;
+        this.getBorrowable = (borrowable) => this.borrowables[borrowable];
+        this.getBorrowableA = () => this.getBorrowable(types_1.Borrowable.A);
+        this.getBorrowableB = () => this.getBorrowable(types_1.Borrowable.B);
+        this.getCollateral = () => this.collateral;
+        this.getNftlp = () => this.nftlp;
+        this.nftlp = lendingPool.getNftlp().getNewInteractionsNftlpObject(this);
+    }
+    getNewCollateralObject() {
+        return new onchainInteractionsCollateralV3_1.default(this);
+    }
+    getNewBorrowableObject(borrowable) {
+        return new onchainInteractionsBorrowableV3_1.default(this, borrowable);
+    }
+    getAccountLendingPool() {
+        return this.interactions.getAccount().getLendingPool(this.getFactory(), this.getId());
+    }
+}
+exports.default = OnchainInteractionsLendingPoolV3;

package/lib/onchain/interactions/onchainInteractions.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const lendingPool_1 = __importDefault(require("./lendingPool"));
 const onchainInteractionsLendingVault_1 = __importDefault(require("./onchainInteractionsLendingVault"));
 const routers_1 = require("../../config/contracts/routers");
 const ethers_1 = require("ethers");
@@ -40,7 +39,7 @@ class OnchainInteractions {
     }
     initializeLendingPool(factory, pair) {
         const lendingPool = this.onchain.getImpermaxFactory(factory).getLendingPool(pair);
-        return new lendingPool_1.default(this, lendingPool);
+        return lendingPool.getNewInteractionLendingPoolObject(this);
     }
     getLendingPool(factory, pair) {
         if (!this.lendingPools[factory])
@@ -78,12 +77,12 @@ class OnchainInteractions {
     }
     getDefaultRouterContract() {
         if (!this.cache.defaultRouterContract) {
-            const address = routers_1.DEFAULT_ROUTER[this.onchain.network];
+            const address = routers_1.POOL_TOKEN_ROUTER[this.onchain.network];
             if (!address) {
                 console.error("DefaultRouter address not found");
                 return null;
             }
-            this.cache.defaultRouterContract = this.onchain.getContractHelper().newRouter(address);
+            this.cache.defaultRouterContract = this.onchain.getContractHelper().newRouterV2(address);
         }
         return this.cache.defaultRouterContract;
     }

package/lib/onchain/interactions/onchainInteractionsLendingVault.d.ts

@@ -10,5 +10,5 @@ export default class OnchainInteractionsLendingVault extends OnchainInteractions
     getVaultAddress: () => string;
     getAccountPoolToken(): OnchainAccountLendingVault;
     getAccountLendingVault: () => OnchainAccountLendingVault;
-    getRouterContract: () => any;
+    getPoolTokenRouter: () => any;
 }

package/lib/onchain/interactions/onchainInteractionsLendingVault.js

@@ -10,7 +10,7 @@ class OnchainInteractionsLendingVault extends onchainInteractionsPoolToken_1.def
         this.getInteractions = () => this.interactions;
         this.getVaultAddress = () => this.poolToken.getVaultAddress();
         this.getAccountLendingVault = this.getAccountPoolToken;
-        this.getRouterContract = () => this.interactions.getDefaultRouterContract();
+        this.getPoolTokenRouter = () => this.interactions.getDefaultRouterContract();
         this.interactions = interactions;
         this.poolToken = lendingVault;
     }

package/lib/onchain/interactions/onchainInteractionsPoolToken.d.ts

@@ -1,5 +1,5 @@
 import { ethers, BigNumber } from "ethers";
-import { ApprovalType, Contract, PermitData } from "../onchainTypes";
+import { Contract, Permits } from "../onchainTypes";
 import OnchainInteractions from './index';
 import OnchainPoolToken from '../onchainPoolToken';
 import OnchainAccountPoolToken from '../account/onchainAccountPoolToken';
@@ -9,27 +9,27 @@ export default abstract class OnchainInteractionsPoolToken {
     abstract getInteractions(): OnchainInteractions;
     abstract getAccountPoolToken(): OnchainAccountPoolToken;
     getAccountAddress: () => string;
-    protected abstract getRouterContract(): Contract;
+    protected abstract getPoolTokenRouter(): Contract;
     protected getOnchain: () => import("..").default;
+    protected getPermitHelper: () => import("../onchainPermitHelper").default;
     protected send(method: any, onTransactionHash: Function, value?: BigNumber): Promise<any>;
     getOwnerSpender(): {
         owner: string;
         spender: any;
     };
     isWETH(): Promise<boolean>;
-    getAllowance(approvalType: ApprovalType): Promise<ethers.BigNumber>;
-    approve(approvalType: ApprovalType, amount: BigNumber, onTransactionHash: Function): Promise<any>;
-    protected _getPermitData(approvalType: ApprovalType, amount: BigNumber, deadlineArg: BigNumber | null, callBack: (permitData: PermitData | null) => void): Promise<void>;
-    getPermitData(approvalType: ApprovalType, amount: BigNumber, deadlineArg: BigNumber | null, callBack: (permitData: PermitData | null) => void): Promise<void>;
-    protected getSendData(permitData: PermitData | null): Promise<{
+    getPoolTokenAllowance(): Promise<ethers.BigNumber>;
+    getUnderlyingAllowance(): Promise<ethers.BigNumber>;
+    approvePoolToken(amount: BigNumber, onTransactionHash: Function): Promise<any>;
+    approveUnderlying(amount: BigNumber, onTransactionHash: Function): Promise<any>;
+    protected getSendData(permits: Permits): Promise<{
         router: any;
         ptAddress: any;
         account: string;
-        data: string;
-        deadline: ethers.BigNumber;
+        permitsData: string;
     }>;
-    protected mintETH(amount: BigNumber, permitData: PermitData, onTransactionHash: Function): Promise<any>;
-    protected mint(amount: BigNumber, permitData: PermitData, onTransactionHash: Function): Promise<any>;
-    deposit(amount: BigNumber, permitData: PermitData, onTransactionHash: Function): Promise<any>;
-    withdraw(tokens: BigNumber, permitData: PermitData, onTransactionHash: Function): Promise<any>;
+    protected mintETH(amount: BigNumber, onTransactionHash: Function): Promise<any>;
+    protected mint(amount: BigNumber, permits: Permits, onTransactionHash: Function): Promise<any>;
+    deposit(amount: BigNumber, permits: Permits, onTransactionHash: Function): Promise<any>;
+    withdraw(tokens: BigNumber, permits: Permits, onTransactionHash: Function): Promise<any>;
 }