impermax-sdk 2.1.249 → 2.1.251

package/lib/offchain/lendingPool/nftlp/offchainNftlp.d.ts

@@ -1,6 +1,7 @@
 import OffchainCollateralV3 from "../offchainCollateralV3";
 import OffchainAccountCollateralV3 from "../../account/lendingPool/offchainAccountCollateralV3";
 import OffchainAccountNftlp from "../../account/lendingPool/nftlp/offchainAccountNftlp";
+import { Extension } from "../../../config/types";
 export default abstract class OffchainNftlp {
     protected readonly collateral: OffchainCollateralV3;
     protected cache: {
@@ -8,6 +9,7 @@ export default abstract class OffchainNftlp {
         oraclePrice?: Promise<number>;
     };
     constructor(collateral: OffchainCollateralV3);
+    abstract getExtension(): Extension;
     abstract getNewAccountNftlpObject(accountCollateral: OffchainAccountCollateralV3): OffchainAccountNftlp;
     getLendingPool: () => import("../offchainLendingPoolV3").default;
     getNftlpAddress: () => string;

package/lib/offchain/lendingPool/nftlp/offchainNftlpUniswapV3.d.ts

@@ -1,6 +1,7 @@
 import OffchainNftlp from "./offchainNftlp";
 import OffchainAccountCollateralV3 from "../../account/lendingPool/offchainAccountCollateralV3";
 import OffchainAccountNftlpUniswapV3 from "../../account/lendingPool/nftlp/offchainAccountNftlpUniswapV3";
+import { Extension } from "../../../config/types";
 export default class OffchainNftlpUniswapV3 extends OffchainNftlp {
     protected cache: {
         marketPrice?: Promise<number>;
@@ -9,6 +10,7 @@ export default class OffchainNftlpUniswapV3 extends OffchainNftlp {
             [key in number]: Promise<number | null>;
         };
     };
+    getExtension(): Extension;
     getNewAccountNftlpObject(accountCollateral: OffchainAccountCollateralV3): OffchainAccountNftlpUniswapV3;
     protected initializeUniswapV3Pool(fee: number): Promise<{
         price: number;

package/lib/offchain/lendingPool/nftlp/offchainNftlpUniswapV3.js

@@ -7,12 +7,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const offchainNftlp_1 = __importDefault(require("./offchainNftlp"));
 const offchainAccountNftlpUniswapV3_1 = __importDefault(require("../../account/lendingPool/nftlp/offchainAccountNftlpUniswapV3"));
 const uniswapV3General_1 = require("../../../utils/nftlpMath/uniswapV3General");
+const types_1 = require("../../../config/types");
 const FEES = [100, 500, 3000, 10000];
 class OffchainNftlpUniswapV3 extends offchainNftlp_1.default {
     constructor() {
         super(...arguments);
         this.cache = {};
     }
+    getExtension() {
+        return types_1.Extension.UniswapV3;
+    }
     getNewAccountNftlpObject(accountCollateral) {
         return new offchainAccountNftlpUniswapV3_1.default(accountCollateral);
     }

package/lib/onchain/impermaxFactory/lendingPool/nftlp/onchainNftlp.d.ts

@@ -5,6 +5,7 @@ import OnchainAccountNftlp from "../../../account/lendingPool/nftlp";
 import { OnchainInteractionsCollateralV3 } from "../../../interactions/lendingPool";
 import OnchainInteractionsNftlp from "../../../interactions/lendingPool/nftlp";
 import OnchainCollateralV3 from "../onchainCollateralV3";
+import { Extension } from "../../../../config/types";
 export default abstract class OnchainNftlp {
     protected readonly collateral: OnchainCollateralV3;
     protected cache: {
@@ -12,6 +13,7 @@ export default abstract class OnchainNftlp {
         marketPrice?: Promise<number>;
         oraclePrice?: Promise<number>;
     };
+    abstract getExtension(): Extension;
     abstract getNewAccountNftlpObject(accountCollateral: OnchainAccountCollateralV3): OnchainAccountNftlp;
     abstract getNewInteractionsNftlpObject(interactionsCollateral: OnchainInteractionsCollateralV3): OnchainInteractionsNftlp;
     constructor(collateral: OnchainCollateralV3);

package/lib/onchain/impermaxFactory/lendingPool/nftlp/onchainNftlpUniswapV3.d.ts

@@ -4,6 +4,7 @@ import { OnchainAccountCollateralV3 } from "../../../account/lendingPool";
 import { OnchainAccountNftlpUniswapV3 } from "../../../account/lendingPool/nftlp";
 import { OnchainInteractionsNftlpUniswapV3 } from "../../../interactions/lendingPool/nftlp";
 import { OnchainInteractionsCollateralV3 } from "../../../interactions/lendingPool";
+import { Extension } from "../../../../config/types";
 export default class OnchainNftlpUniswapV3 extends OnchainNftlp {
     protected cache: {
         nftlp?: Contract;
@@ -13,6 +14,7 @@ export default class OnchainNftlpUniswapV3 extends OnchainNftlp {
         marketPrice?: Promise<number>;
         oraclePrice?: Promise<number>;
     };
+    getExtension(): Extension;
     getNewAccountNftlpObject(accountCollateral: OnchainAccountCollateralV3): OnchainAccountNftlpUniswapV3;
     getNewInteractionsNftlpObject(interactionsCollateral: OnchainInteractionsCollateralV3): OnchainInteractionsNftlpUniswapV3;
     protected initializeNftlp(): any;

package/lib/onchain/impermaxFactory/lendingPool/nftlp/onchainNftlpUniswapV3.js

@@ -7,6 +7,7 @@ const onchainNftlp_1 = __importDefault(require("./onchainNftlp"));
 const nftlp_1 = require("../../../account/lendingPool/nftlp");
 const nftlp_2 = require("../../../interactions/lendingPool/nftlp");
 const uniswapV3General_1 = require("../../../../utils/nftlpMath/uniswapV3General");
+const types_1 = require("../../../../config/types");
 const FEES = [
     100,
     500,
@@ -18,6 +19,9 @@ class OnchainNftlpUniswapV3 extends onchainNftlp_1.default {
         super(...arguments);
         this.cache = {};
     }
+    getExtension() {
+        return types_1.Extension.UniswapV3;
+    }
     getNewAccountNftlpObject(accountCollateral) {
         return new nftlp_1.OnchainAccountNftlpUniswapV3(accountCollateral);
     }

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

@@ -17,6 +17,7 @@ export default abstract class OnchainInteractionsNftlp {
     protected getUiMargin: () => number;
     protected getDust: () => number;
     protected encodePermits: (permits: Permits) => string;
+    getRouter: () => any;
     cleanCache(): void;
     /**
      * Utilities

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

@@ -14,6 +14,7 @@ class OnchainInteractionsNftlp {
         this.getUiMargin = () => this.getLendingPool().getLendingPool().getImpermaxFactory().getOnchain().uiMargin;
         this.getDust = () => this.getLendingPool().getLendingPool().getImpermaxFactory().getOnchain().dust;
         this.encodePermits = (permits) => this.getLendingPool().getInteractions().getOnchain().getPermitHelper().encodePermits(permits);
+        this.getRouter = () => this.getLendingPool().getLendingPool().getImpermaxFactory().getRouterExtension(this.getNftlp().getExtension());
         this.collateral = collateral;
     }
     cleanCache() {

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

@@ -4,7 +4,6 @@ import { OnchainAccountNftlpUniswapV3 } from "../../../account/lendingPool/nftlp
 import { BigNumber } from "ethers";
 export default class OnchainInteractionsNftlpUniswapV3 extends OnchainInteractionsNftlp {
     protected cache: {};
-    getUniswapV3Router: () => any;
     getNftlp: () => any;
     getAccountNftlp: () => OnchainAccountNftlpUniswapV3;
     getOwnerSpender(): {

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

@@ -4,21 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const onchainInteractionsNftlp_1 = __importDefault(require("./onchainInteractionsNftlp"));
-const types_1 = require("../../../../config/types");
 const ether_utils_1 = require("../../../../utils/ether-utils");
 const general_1 = require("../../../../config/general");
 class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.default {
     constructor() {
         super(...arguments);
         this.cache = {};
-        this.getUniswapV3Router = () => this.getLendingPool().getLendingPool().getImpermaxFactory().getRouterExtension(types_1.Extension.UniswapV3);
         this.getNftlp = () => this.getLendingPool().getLendingPool().getNftlp();
         this.getAccountNftlp = () => this.getLendingPool().getAccountLendingPool().getNftlp();
     }
     getOwnerSpender() {
         return {
             owner: this.getAccountAddress(),
-            spender: this.getUniswapV3Router()._address,
+            spender: this.getRouter()._address,
         };
     }
     async getMintEmptyAction() {
@@ -56,7 +54,7 @@ class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.defau
         let actions = [];
         if (depositADelta > 0 && depositBDelta < 0 || depositBDelta > 0 && depositADelta < 0)
             throw new Error("Opposite depositADelta and depositBDelta signs");
-        const router = this.getUniswapV3Router();
+        const router = this.getRouter();
         const actionsGetter = this.getActionsGetter();
         let percentageToRemove = 0;
         if (depositADelta > 0 || depositBDelta > 0) {
@@ -227,7 +225,7 @@ class OnchainInteractionsNftlpUniswapV3 extends onchainInteractionsNftlp_1.defau
         };
     }
     async execute(tokenId, actions, permits, withCollateralTransfer, ethValue, onTransactionHash) {
-        const router = this.getUniswapV3Router();
+        const router = this.getRouter();
         return this.getLendingPool().send(router.methods.execute(await this.getNftlp().getNftlpAddress(), tokenId == -1 ? general_1.MAX_UINT : tokenId.toString(), this.encodeActions(actions), this.encodePermits(permits), withCollateralTransfer), onTransactionHash, ethValue);
     }
 }

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

@@ -1,8 +1,10 @@
-import { Borrowable } from '../../../config/types';
+import { Borrowable, Extension, Factory } from '../../../config/types';
 import OnchainInteractionsLendingPool from './index';
 import OnchainInteractionsPoolToken from '../onchainInteractionsPoolToken';
 import OnchainBorrowable from '../../impermaxFactory/lendingPool/onchainBorrowable';
 import OnchainAccountBorrowable from '../../account/lendingPool/onchainAccountBorrowable';
+import { BigNumber } from "ethers";
+import { Permit } from "../../onchainTypes";
 export default abstract class OnchainInteractionsBorrowable extends OnchainInteractionsPoolToken {
     protected readonly lendingPool: OnchainInteractionsLendingPool;
     protected readonly poolToken: OnchainBorrowable;
@@ -14,4 +16,10 @@ export default abstract class OnchainInteractionsBorrowable extends OnchainInter
     getAccountBorrowable: () => OnchainAccountBorrowable;
     getPoolTokenRouter: () => any;
     private getBorrowableType;
+    /**
+     * Borrow approve
+     */
+    getBorrowAllowance(factory?: Factory, extension?: Extension): Promise<BigNumber>;
+    borrowApprove(amount: BigNumber, onTransactionHash: Function, factory?: Factory, extension?: Extension): Promise<any>;
+    permitBorrow(amount: BigNumber, factory?: Factory, extension?: Extension): Promise<Permit>;
 }

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const onchainInteractionsPoolToken_1 = __importDefault(require("../onchainInteractionsPoolToken"));
+const ethers_1 = require("ethers");
 class OnchainInteractionsBorrowable extends onchainInteractionsPoolToken_1.default {
     constructor(lendingPool, borrowable) {
         super();
@@ -20,5 +21,24 @@ class OnchainInteractionsBorrowable extends onchainInteractionsPoolToken_1.defau
     getAccountPoolToken() {
         return this.lendingPool.getAccountLendingPool().getBorrowable(this.getBorrowableType());
     }
+    /**
+     * Borrow approve
+     */
+    async getBorrowAllowance(factory, extension) {
+        const poolToken = await this.poolToken.getPoolToken();
+        const { owner, spender } = this.getOwnerSpender(factory, extension);
+        const allowance = await poolToken.methods.borrowAllowance(owner, spender).call();
+        return ethers_1.BigNumber.from(allowance);
+    }
+    async borrowApprove(amount, onTransactionHash, factory, extension) {
+        const { spender } = this.getOwnerSpender(factory, extension);
+        const poolToken = await this.poolToken.getPoolToken();
+        return this.send(poolToken.methods.borrowApprove(spender, amount), onTransactionHash);
+    }
+    async permitBorrow(amount, factory, extension) {
+        const { owner, spender } = this.getOwnerSpender(factory, extension);
+        const poolToken = await this.poolToken.getPoolToken();
+        return this.getPermitHelper().getBorrowPermit(poolToken, owner, spender, amount);
+    }
 }
 exports.default = OnchainInteractionsBorrowable;

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

@@ -1,5 +1,3 @@
-import { Permits } from '../../onchainTypes';
-import { BigNumber } from 'ethers';
 import OnchainInteractionsBorrowable from "./onchainInteractionsBorrowable";
 import { OnchainBorrowableV2 } from "../../impermaxFactory/lendingPool";
 import OnchainInteractionsLendingPoolV2 from "./onchainInteractionsLendingPoolV2";
@@ -8,8 +6,4 @@ export default class OnchainInteractionsBorrowableV2 extends OnchainInteractions
     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

@@ -3,44 +3,32 @@ 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;
-    }
-    async getBorrowAllowance() {
-        const poolToken = await this.poolToken.getPoolToken();
-        const { owner, spender } = this.getOwnerSpender();
-        const allowance = await poolToken.methods.borrowAllowance(owner, spender).call();
-        return ethers_1.BigNumber.from(allowance);
-    }
-    async borrowApprove(amount, onTransactionHash) {
-        const { spender } = this.getOwnerSpender();
-        const poolToken = await this.poolToken.getPoolToken();
-        return this.send(poolToken.methods.borrowApprove(spender, amount), onTransactionHash);
-    }
-    async borrow(amount, permits, onTransactionHash) {
-        const { router, ptAddress, account } = await this.getSendData(permits);
-        // TODO temporary fix
-        if (await this.isWETH()) {
+        /*
+        public async borrow(amount: BigNumber, permits: Permits, onTransactionHash: Function) {
+          const {router, ptAddress, account} = await this.getSendData(permits);
+          // TODO temporary fix
+          if (await this.isWETH()) {
             return this.send(router.methods.borrowETH(ptAddress, amount, account, '100000000000000000', '0x'), onTransactionHash);
-        }
-        else {
+          } else {
             return this.send(router.methods.borrow(ptAddress, amount, account, '100000000000000000', '0x'), onTransactionHash);
+          }
         }
-    }
-    async repay(amount, onTransactionHash) {
-        const { router, ptAddress, account } = await this.getSendData([]);
-        if (await 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);
+      
+        public async repay(amount: BigNumber, onTransactionHash: Function) {
+          const {router, ptAddress, account} = await this.getSendData([]);
+          if (await this.isWETH()) {
+            return this.send(router.methods.repayETH(ptAddress, account, DEADLINE), onTransactionHash, amount);
+          } else {
+            return this.send(router.methods.repay(ptAddress, amount, account, DEADLINE), onTransactionHash);
+          }
         }
+        */
     }
 }
 exports.default = OnchainInteractionsBorrowableV2;

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

@@ -15,7 +15,7 @@ export default class OnchainInteractionsCollateralV2 extends OnchainInteractions
     getInteractions: () => import("..").default;
     getActionsGetter: () => any;
     getPoolTokenRouter: () => any;
-    getRouterV2: () => any;
+    getRouter: () => any;
     getDust: () => number;
     protected encodePermits: (permits: Permits) => string;
     getAccountPoolToken(): OnchainAccountCollateralV2;

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

@@ -16,7 +16,7 @@ class OnchainInteractionsCollateralV2 extends onchainInteractionsPoolToken_1.def
         this.getInteractions = () => this.lendingPool.getInteractions();
         this.getActionsGetter = () => this.getLendingPool().getLendingPool().getImpermaxFactory().getActionsGetter();
         this.getPoolTokenRouter = () => this.lendingPool.getPoolTokenRouter();
-        this.getRouterV2 = () => this.lendingPool.getLendingPool().getImpermaxFactory().getRouter();
+        this.getRouter = () => this.lendingPool.getLendingPool().getImpermaxFactory().getRouter();
         this.getDust = () => this.lendingPool.getLendingPool().getImpermaxFactory().getOnchain().dust;
         this.encodePermits = (permits) => this.getLendingPool().getInteractions().getOnchain().getPermitHelper().encodePermits(permits);
         this.getAccountCollateral = this.getAccountPoolToken;
@@ -51,7 +51,7 @@ class OnchainInteractionsCollateralV2 extends onchainInteractionsPoolToken_1.def
     getOwnerSpender() {
         return {
             owner: this.getAccountAddress(),
-            spender: this.getRouterV2()._address,
+            spender: this.getRouter()._address,
         };
     }
     /**
@@ -77,7 +77,7 @@ class OnchainInteractionsCollateralV2 extends onchainInteractionsPoolToken_1.def
         let actions = [];
         if (depositADelta > 0 && depositBDelta < 0 || depositBDelta > 0 && depositADelta < 0)
             throw new Error("Opposite depositADelta and depositBDelta signs");
-        const router = this.getRouterV2();
+        const router = this.getRouter();
         const actionsGetter = this.getActionsGetter();
         let percentageToRemove = 0;
         if (depositADelta > 0 || depositBDelta > 0) {
@@ -257,7 +257,7 @@ class OnchainInteractionsCollateralV2 extends onchainInteractionsPoolToken_1.def
         };
     }
     async execute(actions, permits, ethValue, onTransactionHash) {
-        const router = this.getRouterV2();
+        const router = this.getRouter();
         return this.getLendingPool().send(router.methods.execute(await this.getCollateral().getTokenAddress(), this.encodeActions(actions), this.encodePermits(permits)), onTransactionHash, ethValue);
     }
 }

package/lib/onchain/onchainPermitHelper.d.ts

@@ -16,6 +16,7 @@ export default class OnchainPermitHelper {
     private getPermit2SingleJSONData;
     private getSignature;
     getTokenPermit(token: Contract, owner: Address, spender: Address, value: BigNumber, version?: null): Promise<Permit>;
+    getBorrowPermit(token: Contract, owner: Address, spender: Address, value: BigNumber): Promise<Permit>;
     getNftPermit(token: Contract, owner: Address, spender: Address, tokenId: BigNumber): Promise<Permit>;
     getPermit2Single(token: Contract, owner: Address, spender: Address, value: BigNumber): Promise<Permit>;
 }

package/lib/onchain/onchainPermitHelper.js

@@ -128,6 +128,21 @@ class OnchainPermitHelper {
             signature: await this.getSignature(owner, jsonData)
         };
     }
+    async getBorrowPermit(token, owner, spender, value) {
+        const nonce = await token.methods.nonces(owner).call();
+        const jsonData = await this.getBorrowPermitJSONData(token, {
+            owner,
+            spender,
+            value: value.toString(),
+            nonce: ethers_1.BigNumber.from(nonce).toString(),
+            deadline: this.deadline,
+        });
+        return {
+            permitType: onchainTypes_1.PermitType.PERMIT_BORROW,
+            permitData: ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'uint256'], [token._address, value.toString(), this.deadline]),
+            signature: await this.getSignature(owner, jsonData)
+        };
+    }
     async getNftPermit(token, owner, spender, tokenId) {
         const nonce = await token.methods.nonces(tokenId).call();
         const jsonData = await this.getNftPermitJSONData(token, {

package/lib/onchain/onchainTypes.d.ts

@@ -11,7 +11,8 @@ export declare enum PermitType {
     PERMIT1 = 0,
     PERMIT_NFT = 1,
     PERMIT2_SINGLE = 2,
-    PERMIT2_BATCH = 3
+    PERMIT2_BATCH = 3,
+    PERMIT_BORROW = 4
 }
 export interface PermitData {
     permitData: string;

package/lib/onchain/onchainTypes.js

@@ -13,6 +13,7 @@ var PermitType;
     PermitType[PermitType["PERMIT_NFT"] = 1] = "PERMIT_NFT";
     PermitType[PermitType["PERMIT2_SINGLE"] = 2] = "PERMIT2_SINGLE";
     PermitType[PermitType["PERMIT2_BATCH"] = 3] = "PERMIT2_BATCH";
+    PermitType[PermitType["PERMIT_BORROW"] = 4] = "PERMIT_BORROW";
 })(PermitType = exports.PermitType || (exports.PermitType = {}));
 exports.NO_CHANGES = {
     changeBorrowedA: 0,

package/package.json

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