impermax-sdk 1.2.112 → 2.1.0

package/lib/onchain/impermaxFactory/onchainImpermaxFactoryV3.js

@@ -0,0 +1,88 @@
+"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 __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 });
+const types_1 = require("../../config/types");
+const lendingPool_1 = require("./lendingPool");
+const onchainImpermaxFactory_1 = __importStar(require("./onchainImpermaxFactory"));
+const routers_1 = require("../../config/contracts/routers");
+class OnchainImpermaxFactoryV3 extends onchainImpermaxFactory_1.default {
+    constructor() {
+        super(...arguments);
+        this.version = onchainImpermaxFactory_1.Version.V3;
+    }
+    getRouterExtension(extension) {
+        if (!this.cache.routerExtensionContract)
+            this.cache.routerExtensionContract = {};
+        if (!this.cache.routerExtensionContract[extension]) {
+            const address = routers_1.ROUTER_V3[this.onchain.network][extension];
+            if (!address) {
+                console.error("Router address not found for extension", Object.keys(types_1.Extension)[extension]);
+                return null;
+            }
+            let router;
+            switch (extension) {
+                case types_1.Extension.UniswapV2:
+                    router = this.onchain.getContractHelper().newRouterUniV2(address);
+                    break;
+                case types_1.Extension.UniswapV3:
+                    router = this.onchain.getContractHelper().newRouterUniV3(address);
+                    break;
+            }
+            this.cache.routerExtensionContract[extension] = router;
+        }
+        return this.cache.routerExtensionContract[extension];
+    }
+    getFactoryContract() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.cache.factoryContract) {
+                for (const extension of Object.keys(types_1.Extension)) {
+                    if (!routers_1.ROUTER_V3[this.onchain.network][types_1.Extension[extension]])
+                        continue;
+                    const router = this.getRouterExtension(types_1.Extension[extension]);
+                    const factoryAddress = router.methods.factory().call();
+                    this.cache.factoryContract = this.onchain.getContractHelper().newFactoryV3(factoryAddress);
+                    break;
+                }
+            }
+            if (!this.cache.factoryContract) {
+                console.error("No V3 router set for this network:", this.onchain.network);
+            }
+            return this.cache.factoryContract;
+        });
+    }
+    getNewLendingPoolObject(id) {
+        return new lendingPool_1.OnchainLendingPoolV3(this, id);
+    }
+}
+exports.default = OnchainImpermaxFactoryV3;

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

@@ -1,5 +1,12 @@
+import * as nftlp from './nftlp';
 import OnchainInteractionsCollateral from './onchainInteractionsCollateral';
 import OnchainInteractionsBorrowable from './onchainInteractionsBorrowable';
 import OnchainInteractionsLendingPool from './onchainInteractionsLendingPool';
-export { OnchainInteractionsBorrowable, OnchainInteractionsCollateral, };
+import OnchainInteractionsCollateralV2 from "./onchainInteractionsCollateralV2";
+import OnchainInteractionsBorrowableV2 from "./onchainInteractionsBorrowableV2";
+import OnchainInteractionsLendingPoolV2 from "./onchainInteractionsLendingPoolV2";
+import OnchainInteractionsLendingPoolV3 from './onchainInteractionsLendingPoolV3';
+import OnchainInteractionsBorrowableV3 from './onchainInteractionsBorrowableV3';
+import OnchainInteractionsCollateralV3 from './onchainInteractionsCollateralV3';
+export { nftlp, OnchainInteractionsBorrowable, OnchainInteractionsCollateral, OnchainInteractionsLendingPoolV2, OnchainInteractionsBorrowableV2, OnchainInteractionsCollateralV2, OnchainInteractionsLendingPoolV3, OnchainInteractionsBorrowableV3, OnchainInteractionsCollateralV3, };
 export default OnchainInteractionsLendingPool;

package/lib/onchain/interactions/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.OnchainInteractionsCollateral = exports.OnchainInteractionsBorrowable = void 0;
+exports.OnchainInteractionsCollateralV3 = exports.OnchainInteractionsBorrowableV3 = exports.OnchainInteractionsLendingPoolV3 = exports.OnchainInteractionsCollateralV2 = exports.OnchainInteractionsBorrowableV2 = exports.OnchainInteractionsLendingPoolV2 = exports.OnchainInteractionsCollateral = exports.OnchainInteractionsBorrowable = exports.nftlp = void 0;
+const nftlp = __importStar(require("./nftlp"));
+exports.nftlp = nftlp;
 const onchainInteractionsCollateral_1 = __importDefault(require("./onchainInteractionsCollateral"));
 exports.OnchainInteractionsCollateral = onchainInteractionsCollateral_1.default;
 const onchainInteractionsBorrowable_1 = __importDefault(require("./onchainInteractionsBorrowable"));
 exports.OnchainInteractionsBorrowable = onchainInteractionsBorrowable_1.default;
 const onchainInteractionsLendingPool_1 = __importDefault(require("./onchainInteractionsLendingPool"));
+const onchainInteractionsCollateralV2_1 = __importDefault(require("./onchainInteractionsCollateralV2"));
+exports.OnchainInteractionsCollateralV2 = onchainInteractionsCollateralV2_1.default;
+const onchainInteractionsBorrowableV2_1 = __importDefault(require("./onchainInteractionsBorrowableV2"));
+exports.OnchainInteractionsBorrowableV2 = onchainInteractionsBorrowableV2_1.default;
+const onchainInteractionsLendingPoolV2_1 = __importDefault(require("./onchainInteractionsLendingPoolV2"));
+exports.OnchainInteractionsLendingPoolV2 = onchainInteractionsLendingPoolV2_1.default;
+const onchainInteractionsLendingPoolV3_1 = __importDefault(require("./onchainInteractionsLendingPoolV3"));
+exports.OnchainInteractionsLendingPoolV3 = onchainInteractionsLendingPoolV3_1.default;
+const onchainInteractionsBorrowableV3_1 = __importDefault(require("./onchainInteractionsBorrowableV3"));
+exports.OnchainInteractionsBorrowableV3 = onchainInteractionsBorrowableV3_1.default;
+const onchainInteractionsCollateralV3_1 = __importDefault(require("./onchainInteractionsCollateralV3"));
+exports.OnchainInteractionsCollateralV3 = onchainInteractionsCollateralV3_1.default;
 exports.default = onchainInteractionsLendingPool_1.default;

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

@@ -0,0 +1,4 @@
+import OnchainInteractionsNftlp from './onchainInteractionsNftlp';
+import OnchainInteractionsNftlpUniswapV3 from './onchainInteractionsNftlpUniswapV3';
+export { OnchainInteractionsNftlp, OnchainInteractionsNftlpUniswapV3, };
+export default OnchainInteractionsNftlp;

package/lib/onchain/interactions/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.OnchainInteractionsNftlpUniswapV3 = exports.OnchainInteractionsNftlp = void 0;
+const onchainInteractionsNftlp_1 = __importDefault(require("./onchainInteractionsNftlp"));
+exports.OnchainInteractionsNftlp = onchainInteractionsNftlp_1.default;
+const onchainInteractionsNftlpUniswapV3_1 = __importDefault(require("./onchainInteractionsNftlpUniswapV3"));
+exports.OnchainInteractionsNftlpUniswapV3 = onchainInteractionsNftlpUniswapV3_1.default;
+exports.default = onchainInteractionsNftlp_1.default;

package/lib/onchain/interactions/lendingPool/nftlp/onchainInteractionsNftlp.d.ts

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

package/lib/onchain/interactions/lendingPool/nftlp/onchainInteractionsNftlp.js

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

package/lib/onchain/interactions/lendingPool/nftlp/onchainInteractionsNftlpUniswapV3.d.ts

@@ -0,0 +1,4 @@
+import OnchainInteractionsNftlp from "./onchainInteractionsNftlp";
+export default class OnchainInteractionsNftlpUniswapV3 extends OnchainInteractionsNftlp {
+    protected cache: {};
+}

package/lib/onchain/interactions/lendingPool/nftlp/onchainInteractionsNftlpUniswapV3.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 onchainInteractionsNftlp_1 = __importDefault(require("./onchainInteractionsNftlp"));
+class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.default {
+    constructor() {
+        super(...arguments);
+        this.cache = {};
+    }
+}
+exports.default = OnchainInteractionsNftlpUniswapV3;

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

@@ -1,21 +1,17 @@
-import { PoolTokenType } from '../../../config/types';
+import { Borrowable } from '../../../config/types';
 import OnchainInteractionsLendingPool from './index';
-import { PermitData } from '../../onchainTypes';
-import { BigNumber } from 'ethers';
 import OnchainInteractionsPoolToken from '../onchainInteractionsPoolToken';
 import OnchainBorrowable from '../../impermaxFactory/lendingPool/onchainBorrowable';
 import OnchainAccountBorrowable from '../../account/lendingPool/onchainAccountBorrowable';
-export default class OnchainInteractionsBorrowable extends OnchainInteractionsPoolToken {
-    private readonly lendingPool;
+export default abstract class OnchainInteractionsBorrowable extends OnchainInteractionsPoolToken {
+    protected readonly lendingPool: OnchainInteractionsLendingPool;
     protected readonly poolToken: OnchainBorrowable;
-    constructor(lendingPool: OnchainInteractionsLendingPool, poolTokenType: PoolTokenType);
+    constructor(lendingPool: OnchainInteractionsLendingPool, borrowable: Borrowable);
     getLendingPool: () => OnchainInteractionsLendingPool;
     getPoolToken: () => OnchainBorrowable;
     getInteractions: () => import("..").default;
     getAccountPoolToken(): OnchainAccountBorrowable;
     getAccountBorrowable: () => OnchainAccountBorrowable;
-    getRouterContract: () => any;
-    private getPoolTokenType;
-    borrow(amount: BigNumber, permitData: PermitData, onTransactionHash: Function): Promise<any>;
-    repay(amount: BigNumber, onTransactionHash: Function): Promise<any>;
+    getPoolTokenRouter: () => any;
+    private getBorrowableType;
 }

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

@@ -1,56 +1,24 @@
 "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 general_1 = require("../../../config/general");
 const onchainInteractionsPoolToken_1 = __importDefault(require("../onchainInteractionsPoolToken"));
 class OnchainInteractionsBorrowable extends onchainInteractionsPoolToken_1.default {
-    constructor(lendingPool, poolTokenType) {
+    constructor(lendingPool, borrowable) {
         super();
         this.getLendingPool = () => this.lendingPool;
         this.getPoolToken = () => this.poolToken;
         this.getInteractions = () => this.lendingPool.getInteractions();
         this.getAccountBorrowable = this.getAccountPoolToken;
-        this.getRouterContract = () => this.lendingPool.getRouterContract();
+        this.getPoolTokenRouter = () => this.lendingPool.getPoolTokenRouter();
         // Shortcuts
-        this.getPoolTokenType = () => this.poolToken.getPoolTokenType();
+        this.getBorrowableType = () => this.poolToken.getBorrowableType();
         this.lendingPool = lendingPool;
-        this.poolToken = lendingPool.getLendingPool().getPoolToken(poolTokenType);
+        this.poolToken = lendingPool.getLendingPool().getBorrowable(borrowable);
     }
     getAccountPoolToken() {
-        return this.lendingPool.getAccountLendingPool().getPoolToken(this.getPoolTokenType());
-    }
-    borrow(amount, permitData, onTransactionHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { router, ptAddress, account, data, deadline } = yield this.getSendData(permitData);
-            if (yield this.isWETH()) {
-                return this.send(router.methods.borrowETH(ptAddress, amount, account, deadline, data), onTransactionHash);
-            }
-            else {
-                return this.send(router.methods.borrow(ptAddress, amount, account, deadline, data), onTransactionHash);
-            }
-        });
-    }
-    repay(amount, onTransactionHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { router, ptAddress, account } = yield this.getSendData(null);
-            if (yield this.isWETH()) {
-                return this.send(router.methods.repayETH(ptAddress, account, general_1.DEADLINE), onTransactionHash, amount);
-            }
-            else {
-                return this.send(router.methods.repay(ptAddress, amount, account, general_1.DEADLINE), onTransactionHash);
-            }
-        });
+        return this.lendingPool.getAccountLendingPool().getBorrowable(this.getBorrowableType());
     }
 }
 exports.default = OnchainInteractionsBorrowable;

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

@@ -0,0 +1,15 @@
+import { Permits } from '../../onchainTypes';
+import { BigNumber } from 'ethers';
+import OnchainInteractionsBorrowable from "./onchainInteractionsBorrowable";
+import { OnchainBorrowableV2 } from "../../impermaxFactory/lendingPool";
+import OnchainInteractionsLendingPoolV2 from "./onchainInteractionsLendingPoolV2";
+export default class OnchainInteractionsBorrowableV2 extends OnchainInteractionsBorrowable {
+    protected readonly lendingPool: OnchainInteractionsLendingPoolV2;
+    protected readonly poolToken: OnchainBorrowableV2;
+    getLendingPool: () => OnchainInteractionsLendingPoolV2;
+    getPoolToken: () => OnchainBorrowableV2;
+    getBorrowAllowance(): Promise<BigNumber>;
+    borrowApprove(amount: BigNumber, onTransactionHash: Function): Promise<any>;
+    borrow(amount: BigNumber, permits: Permits, onTransactionHash: Function): Promise<any>;
+    repay(amount: BigNumber, onTransactionHash: Function): Promise<any>;
+}

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

@@ -0,0 +1,63 @@
+"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 general_1 = require("../../../config/general");
+const ethers_1 = require("ethers");
+const onchainInteractionsBorrowable_1 = __importDefault(require("./onchainInteractionsBorrowable"));
+class OnchainInteractionsBorrowableV2 extends onchainInteractionsBorrowable_1.default {
+    constructor() {
+        super(...arguments);
+        this.getLendingPool = () => this.lendingPool;
+        this.getPoolToken = () => this.poolToken;
+    }
+    getBorrowAllowance() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const poolToken = yield this.poolToken.getPoolToken();
+            const { owner, spender } = this.getOwnerSpender();
+            const allowance = yield poolToken.methods.borrowAllowance(owner, spender).call();
+            return ethers_1.BigNumber.from(allowance);
+        });
+    }
+    borrowApprove(amount, onTransactionHash) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { spender } = this.getOwnerSpender();
+            const poolToken = yield this.poolToken.getPoolToken();
+            return this.send(poolToken.methods.borrowApprove(spender, amount), onTransactionHash);
+        });
+    }
+    borrow(amount, permits, onTransactionHash) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { router, ptAddress, account } = yield this.getSendData(permits);
+            // TODO temporary fix
+            if (yield this.isWETH()) {
+                return this.send(router.methods.borrowETH(ptAddress, amount, account, '100000000000000000', '0x'), onTransactionHash);
+            }
+            else {
+                return this.send(router.methods.borrow(ptAddress, amount, account, '100000000000000000', '0x'), onTransactionHash);
+            }
+        });
+    }
+    repay(amount, onTransactionHash) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { router, ptAddress, account } = yield this.getSendData([]);
+            if (yield this.isWETH()) {
+                return this.send(router.methods.repayETH(ptAddress, account, general_1.DEADLINE), onTransactionHash, amount);
+            }
+            else {
+                return this.send(router.methods.repay(ptAddress, amount, account, general_1.DEADLINE), onTransactionHash);
+            }
+        });
+    }
+}
+exports.default = OnchainInteractionsBorrowableV2;

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

@@ -0,0 +1,9 @@
+import OnchainInteractionsBorrowable from "./onchainInteractionsBorrowable";
+import { OnchainBorrowableV3 } from "../../impermaxFactory/lendingPool";
+import OnchainInteractionsLendingPoolV3 from "./onchainInteractionsLendingPoolV3";
+export default class OnchainInteractionsBorrowableV3 extends OnchainInteractionsBorrowable {
+    protected readonly lendingPool: OnchainInteractionsLendingPoolV3;
+    protected readonly poolToken: OnchainBorrowableV3;
+    getLendingPool: () => OnchainInteractionsLendingPoolV3;
+    getPoolToken: () => OnchainBorrowableV3;
+}

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

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const onchainInteractionsBorrowable_1 = __importDefault(require("./onchainInteractionsBorrowable"));
+class OnchainInteractionsBorrowableV3 extends onchainInteractionsBorrowable_1.default {
+    constructor() {
+        super(...arguments);
+        this.getLendingPool = () => this.lendingPool;
+        this.getPoolToken = () => this.poolToken;
+    }
+}
+exports.default = OnchainInteractionsBorrowableV3;

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

@@ -1,19 +1,7 @@
 import OnchainInteractionsLendingPool from './index';
-import { ApprovalType, PermitData } from '../../onchainTypes';
-import { BigNumber } from 'ethers';
-import OnchainInteractionsPoolToken from '../onchainInteractionsPoolToken';
-import OnchainCollateral from '../../impermaxFactory/lendingPool/onchainCollateral';
 import OnchainAccountCollateral from '../../account/lendingPool/onchainAccountCollateral';
-export default class OnchainInteractionsCollateral extends OnchainInteractionsPoolToken {
-    private readonly lendingPool;
-    protected readonly poolToken: OnchainCollateral;
-    constructor(interactionsLendingPool: OnchainInteractionsLendingPool);
-    getLendingPool: () => OnchainInteractionsLendingPool;
-    getPoolToken: () => OnchainCollateral;
+export default abstract class OnchainInteractionsCollateral {
+    abstract getLendingPool(): OnchainInteractionsLendingPool;
     getInteractions: () => import("..").default;
-    getAccountPoolToken(): OnchainAccountCollateral;
-    getAccountCollateral: () => OnchainAccountCollateral;
-    getRouterContract: () => any;
-    getPermitData(approvalType: ApprovalType, amount: BigNumber, deadlineArg: BigNumber | null, callBack: (permitData: PermitData | null) => void): Promise<void>;
-    protected mint(amount: BigNumber, permitData: PermitData, onTransactionHash: Function): Promise<any>;
+    getAccountCollateral(): OnchainAccountCollateral;
 }

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

@@ -1,43 +1,11 @@
 "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 onchainInteractionsPoolToken_1 = __importDefault(require("../onchainInteractionsPoolToken"));
-class OnchainInteractionsCollateral extends onchainInteractionsPoolToken_1.default {
-    constructor(interactionsLendingPool) {
-        super();
-        this.getLendingPool = () => this.lendingPool;
-        this.getPoolToken = () => this.poolToken;
-        this.getInteractions = () => this.lendingPool.getInteractions();
-        this.getAccountCollateral = this.getAccountPoolToken;
-        this.getRouterContract = () => this.lendingPool.getRouterContract();
-        this.lendingPool = interactionsLendingPool;
-        this.poolToken = interactionsLendingPool.getLendingPool().getCollateral();
+class OnchainInteractionsCollateral {
+    constructor() {
+        this.getInteractions = () => this.getLendingPool().getInteractions();
     }
-    getAccountPoolToken() {
-        return this.lendingPool.getAccountLendingPool().getCollateral();
+    getAccountCollateral() {
+        return this.getLendingPool().getAccountLendingPool().getCollateral();
     }
-    getPermitData(approvalType, amount, deadlineArg, callBack) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._getPermitData(approvalType, amount, deadlineArg, callBack);
-        });
-    }
-    mint(amount, permitData, onTransactionHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { router, ptAddress, account, data, deadline } = yield this.getSendData(permitData);
-            return this.send(router.methods.mintCollateral(ptAddress, amount, account, deadline, data), onTransactionHash);
-        });
-    }
-    ;
 }
 exports.default = OnchainInteractionsCollateral;

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

@@ -0,0 +1,20 @@
+import { Permits } from '../../onchainTypes';
+import { BigNumber } from 'ethers';
+import OnchainInteractionsPoolToken from '../onchainInteractionsPoolToken';
+import OnchainInteractionsCollateral from "./onchainInteractionsCollateral";
+import OnchainInteractionsLendingPoolV2 from "./onchainInteractionsLendingPoolV2";
+import { OnchainCollateralV2 } from "../../impermaxFactory/lendingPool";
+import { OnchainAccountCollateralV2 } from "../../account/lendingPool";
+export default class OnchainInteractionsCollateralV2 extends OnchainInteractionsPoolToken implements OnchainInteractionsCollateral {
+    protected readonly lendingPool: OnchainInteractionsLendingPoolV2;
+    protected readonly poolToken: OnchainCollateralV2;
+    constructor(interactionsLendingPool: OnchainInteractionsLendingPoolV2);
+    getLendingPool: () => OnchainInteractionsLendingPoolV2;
+    getPoolToken: () => OnchainCollateralV2;
+    getCollateral: () => OnchainCollateralV2;
+    getInteractions: () => import("..").default;
+    getAccountPoolToken(): OnchainAccountCollateralV2;
+    getAccountCollateral: () => OnchainAccountCollateralV2;
+    getPoolTokenRouter: () => any;
+    protected mint(amount: BigNumber, permit: Permits, onTransactionHash: Function): Promise<any>;
+}

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

@@ -0,0 +1,48 @@
+"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 onchainInteractionsPoolToken_1 = __importDefault(require("../onchainInteractionsPoolToken"));
+class OnchainInteractionsCollateralV2 extends onchainInteractionsPoolToken_1.default {
+    constructor(interactionsLendingPool) {
+        super();
+        this.getLendingPool = () => this.lendingPool;
+        this.getPoolToken = () => this.poolToken;
+        this.getCollateral = () => this.poolToken;
+        this.getInteractions = () => this.lendingPool.getInteractions();
+        this.getAccountCollateral = this.getAccountPoolToken;
+        this.getPoolTokenRouter = () => this.lendingPool.getPoolTokenRouter();
+        this.lendingPool = interactionsLendingPool;
+        this.poolToken = interactionsLendingPool.getLendingPool().getCollateral();
+    }
+    getAccountPoolToken() {
+        return this.lendingPool.getAccountLendingPool().getCollateral();
+    }
+    /*public async getPermitData(
+      approvalType: ApprovalType,
+      amount: BigNumber,
+      deadlineArg: BigNumber | null,
+      callBack: (permitData: PermitData | null) => void
+    ) {
+      this._getPermitData(approvalType, amount, deadlineArg, callBack);
+    }*/
+    mint(amount, permit, onTransactionHash) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // TODO temporary fix
+            const { router, ptAddress, account } = yield this.getSendData(permit);
+            return this.send(router.methods.mintCollateral(ptAddress, amount, account, '100000000000000000', '0x'), onTransactionHash);
+        });
+    }
+    ;
+}
+exports.default = OnchainInteractionsCollateralV2;

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

@@ -0,0 +1,13 @@
+import OnchainInteractionsCollateral from "./onchainInteractionsCollateral";
+import { OnchainCollateralV3 } from "../../impermaxFactory/lendingPool";
+import { OnchainAccountCollateralV3 } from "../../account/lendingPool";
+import OnchainInteractionsLendingPoolV3 from "./onchainInteractionsLendingPoolV3";
+export default class OnchainInteractionsCollateralV3 extends OnchainInteractionsCollateral {
+    protected readonly lendingPool: OnchainInteractionsLendingPoolV3;
+    protected readonly collateral: OnchainCollateralV3;
+    constructor(interactionsLendingPool: OnchainInteractionsLendingPoolV3);
+    getLendingPool: () => OnchainInteractionsLendingPoolV3;
+    getCollateral: () => OnchainCollateralV3;
+    getInteractions: () => import("..").default;
+    getAccountCollateral(): OnchainAccountCollateralV3;
+}

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

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const onchainInteractionsCollateral_1 = __importDefault(require("./onchainInteractionsCollateral"));
+class OnchainInteractionsCollateralV3 extends onchainInteractionsCollateral_1.default {
+    constructor(interactionsLendingPool) {
+        super();
+        this.getLendingPool = () => this.lendingPool;
+        this.getCollateral = () => this.collateral;
+        this.getInteractions = () => this.lendingPool.getInteractions();
+        this.lendingPool = interactionsLendingPool;
+        this.collateral = interactionsLendingPool.getLendingPool().getCollateral();
+    }
+    getAccountCollateral() {
+        return this.lendingPool.getAccountLendingPool().getCollateral();
+    }
+}
+exports.default = OnchainInteractionsCollateralV3;