impermax-sdk 2.1.248 → 2.1.250

package/lib/config/contracts/routers.js

@@ -75,7 +75,7 @@ exports.ROUTER = {
     [types_1.Networks.Moonbeam]: {},
     [types_1.Networks.Sxnetwork]: {},
     [types_1.Networks.Base]: {
-        [types_1.Factory.SOLV2]: '0x1Ab153346De262D59642e63F9569C656EdC6efaF',
+        [types_1.Factory.SOLV2]: '0x9940d4E448Fa0CE8C2CAC9292734A153CD69b04f',
         [types_1.Factory.SOL_STABLE]: '',
         [types_1.Factory.V2V2]: ''
     },

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/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

@@ -56,7 +56,6 @@ const PERMIT2_TYPES = {
     PermitSingle: PERMIT2_SINGLE,
 };
 class OnchainPermitHelper {
-    // TODO crate new router for V2 otherwise borrowPermit will stop working
     constructor(onchain) {
         this.deadline = general_1.DEADLINE.toString();
         this.getDomainPermit1 = async (contract, version = null) => ({
@@ -80,7 +79,6 @@ class OnchainPermitHelper {
     }
     async getTokenPermitJSONData(contract, message, version = null) {
         const domain = await this.getDomainPermit1(contract, version);
-        console.log(domain);
         const primaryType = "Permit";
         return JSON.stringify({ types: TOKEN_PERMIT_TYPES, domain, primaryType, message });
     }
@@ -110,7 +108,6 @@ class OnchainPermitHelper {
                     reject(err);
                 }
                 else {
-                    console.log("signature", data.result);
                     resolve(data.result);
                 }
             });
@@ -131,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, {
@@ -162,7 +174,6 @@ class OnchainPermitHelper {
             spender,
             sigDeadline: this.deadline,
         });
-        console.log("jsonData", jsonData);
         return {
             permitType: onchainTypes_1.PermitType.PERMIT2_SINGLE,
             permitData: ethers_1.ethers.utils.defaultAbiCoder.encode([permitDetailsType, 'address', 'uint256'], [details, spender, this.deadline]),

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.248",
+  "version": "2.1.250",
   "description": "",
   "main": "./lib/index.js",
   "module": "./lib/index.js",