impermax-sdk 1.2.112 → 2.1.0

package/lib/onchain/interactions/onchainInteractionsPoolToken.js

@@ -10,9 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
-const onchainTypes_1 = require("../onchainTypes");
 const weths_1 = require("../../config/contracts/weths");
-const general_1 = require("../../config/general");
 const MAX_UINT256 = ethers_1.ethers.constants.MaxUint256;
 const EIP712DOMAIN = [
     { name: "name", type: "string" },
@@ -38,6 +36,7 @@ class OnchainInteractionsPoolToken {
         // Shortcuts
         this.getAccountAddress = () => this.getInteractions().getAccountAddress();
         this.getOnchain = () => this.getInteractions().getOnchain();
+        this.getPermitHelper = () => this.getOnchain().getPermitHelper();
     }
     send(method, onTransactionHash, value) {
         return this.getInteractions().send(method, onTransactionHash, value);
@@ -46,7 +45,7 @@ class OnchainInteractionsPoolToken {
     getOwnerSpender() {
         return {
             owner: this.getAccountAddress(),
-            spender: this.getRouterContract()._address,
+            spender: this.getPoolTokenRouter()._address,
         };
     }
     isWETH() {
@@ -55,130 +54,79 @@ class OnchainInteractionsPoolToken {
             return token._address.toLowerCase() == weths_1.WETH[this.getOnchain().network].toLowerCase();
         });
     }
-    getAllowance(approvalType) {
+    getPoolTokenAllowance() {
         return __awaiter(this, void 0, void 0, function* () {
             const poolToken = yield this.poolToken.getPoolToken();
-            const token = yield this.poolToken.getToken();
-            if ((yield this.isWETH()) && approvalType == onchainTypes_1.ApprovalType.UNDERLYING)
-                return MAX_UINT256;
             const { owner, spender } = this.getOwnerSpender();
-            const allowance = (approvalType == onchainTypes_1.ApprovalType.POOL_TOKEN) ? yield poolToken.methods.allowance(owner, spender).call() :
-                (approvalType == onchainTypes_1.ApprovalType.UNDERLYING) ? yield token.methods.allowance(owner, spender).call() :
-                    (approvalType == onchainTypes_1.ApprovalType.BORROW) ? yield poolToken.methods.borrowAllowance(owner, spender).call() : 0;
+            const allowance = yield poolToken.methods.allowance(owner, spender).call();
             return ethers_1.BigNumber.from(allowance);
         });
     }
-    approve(approvalType, amount, onTransactionHash) {
+    getUnderlyingAllowance() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { spender } = this.getOwnerSpender();
-            const poolToken = yield this.poolToken.getPoolToken();
+            if (yield this.isWETH())
+                return MAX_UINT256;
             const token = yield this.poolToken.getToken();
-            let method;
-            if (approvalType == onchainTypes_1.ApprovalType.POOL_TOKEN)
-                method = poolToken.methods.approve(spender, amount);
-            if (approvalType == onchainTypes_1.ApprovalType.UNDERLYING)
-                method = token.methods.approve(spender, amount);
-            if (approvalType == onchainTypes_1.ApprovalType.BORROW)
-                method = poolToken.methods.borrowApprove(spender, amount);
-            return this.send(method, onTransactionHash);
+            const { owner, spender } = this.getOwnerSpender();
+            const allowance = yield token.methods.allowance(owner, spender).call();
+            return ethers_1.BigNumber.from(allowance);
         });
     }
-    _getPermitData(approvalType, amount, deadlineArg, callBack) {
+    approvePoolToken(amount, onTransactionHash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { owner, spender } = this.getOwnerSpender();
+            const { spender } = this.getOwnerSpender();
             const poolToken = yield this.poolToken.getPoolToken();
-            const token = yield this.poolToken.getToken();
-            const contract = approvalType == onchainTypes_1.ApprovalType.UNDERLYING ? token : poolToken;
-            const nonce = yield contract.methods.nonces(owner).call();
-            const name = yield contract.methods.name().call();
-            const deadline = deadlineArg ? deadlineArg : general_1.DEADLINE;
-            const data = JSON.stringify({
-                types: TYPES,
-                domain: {
-                    name: name,
-                    version: "1",
-                    chainId: this.getOnchain().chainId,
-                    verifyingContract: contract._address,
-                },
-                primaryType: approvalType == onchainTypes_1.ApprovalType.BORROW ? "BorrowPermit" : "Permit",
-                message: {
-                    owner: owner,
-                    spender: spender,
-                    value: amount.toString(),
-                    nonce: ethers_1.BigNumber.from(nonce).toHexString(),
-                    deadline: deadline.toNumber(),
-                }
-            });
-            this.getOnchain().web3.currentProvider.send({
-                method: "eth_signTypedData_v4",
-                params: [owner, data],
-                from: owner
-            }, (err, data) => {
-                if (err) {
-                    console.error(err);
-                    return callBack(null);
-                }
-                const signature = data.result.substring(2);
-                const r = "0x" + signature.substring(0, 64);
-                const s = "0x" + signature.substring(64, 128);
-                let v = parseInt(signature.substring(128, 130), 16);
-                if (v == 0 || v == 1)
-                    v = v + 27;
-                //console.log(v, r, s);
-                const permitData = ethers_1.ethers.utils.defaultAbiCoder.encode(['bool', 'uint8', 'bytes32', 'bytes32'], [false, v, r, s]);
-                callBack({ permitData, deadline, amount });
-            });
+            return this.send(poolToken.methods.approve(spender, amount), onTransactionHash);
         });
     }
-    getPermitData(approvalType, amount, deadlineArg, callBack) {
+    approveUnderlying(amount, onTransactionHash) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (approvalType === onchainTypes_1.ApprovalType.UNDERLYING)
-                return callBack(null);
-            this._getPermitData(approvalType, amount, deadlineArg, callBack);
+            const { spender } = this.getOwnerSpender();
+            const token = yield this.poolToken.getToken();
+            return this.send(token.methods.approve(spender, amount), onTransactionHash);
         });
     }
-    getSendData(permitData) {
+    getSendData(permits) {
         return __awaiter(this, void 0, void 0, function* () {
             return {
-                router: this.getRouterContract(),
+                router: this.getPoolTokenRouter(),
                 ptAddress: (yield this.poolToken.getPoolToken())._address,
                 account: this.getInteractions().getAccountAddress(),
-                data: permitData ? permitData.permitData : '0x',
-                deadline: permitData ? permitData.deadline : general_1.DEADLINE,
+                permitsData: this.getPermitHelper().encodePermits(permits),
             };
         });
     }
-    mintETH(amount, permitData, onTransactionHash) {
+    mintETH(amount, onTransactionHash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { router, ptAddress, account, deadline } = yield this.getSendData(permitData);
-            return this.send(router.methods.mintETH(ptAddress, account, deadline), onTransactionHash, amount);
+            const { router, ptAddress, account } = yield this.getSendData([]);
+            return this.send(router.methods.mintETH(ptAddress, account), onTransactionHash, amount);
         });
     }
-    mint(amount, permitData, onTransactionHash) {
+    mint(amount, permits, onTransactionHash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { router, ptAddress, account, deadline } = yield this.getSendData(permitData);
-            return this.send(router.methods.mint(ptAddress, amount, account, deadline), onTransactionHash);
+            const { router, ptAddress, account, permitsData } = yield this.getSendData(permits);
+            return this.send(router.methods.mint(ptAddress, amount, account, permitsData), onTransactionHash);
         });
     }
     ;
-    deposit(amount, permitData, onTransactionHash) {
+    deposit(amount, permits, onTransactionHash) {
         return __awaiter(this, void 0, void 0, function* () {
             if (yield this.isWETH()) {
-                return this.mintETH(amount, permitData, onTransactionHash);
+                return this.mintETH(amount, onTransactionHash);
             }
             else {
-                return this.mint(amount, permitData, onTransactionHash);
+                return this.mint(amount, permits, onTransactionHash);
             }
         });
     }
-    withdraw(tokens, permitData, onTransactionHash) {
+    withdraw(tokens, permits, onTransactionHash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { router, ptAddress, account, data, deadline } = yield this.getSendData(permitData);
+            const { router, ptAddress, account, permitsData } = yield this.getSendData(permits);
             if (yield this.isWETH()) {
-                return this.send(router.methods.redeemETH(ptAddress, tokens, account, deadline, data), onTransactionHash);
+                return this.send(router.methods.redeemETH(ptAddress, tokens, account, permitsData), onTransactionHash);
             }
             else {
-                return this.send(router.methods.redeem(ptAddress, tokens, account, deadline, data), onTransactionHash);
+                return this.send(router.methods.redeem(ptAddress, tokens, account, permitsData), onTransactionHash);
             }
         });
     }

package/lib/onchain/onchain.d.ts

@@ -7,6 +7,7 @@ import OnchainAccount from './account';
 import OnchainInteractions from './interactions';
 import { OnchainConfig } from './onchainTypes';
 import OnchainConfigManager from './configManager';
+import OnchainPermitHelper from "./onchainPermitHelper";
 export default class Onchain {
     readonly network: Networks;
     private readonly offchain;
@@ -17,6 +18,7 @@ export default class Onchain {
     readonly liquidityBuffer: number;
     priceInverted: boolean;
     protected contractsHelper: OnchainContractsHelper;
+    protected permitHelper: OnchainPermitHelper;
     protected configManager: OnchainConfigManager;
     protected factories: FactoryIndex<OnchainImpermaxFactory>;
     protected lendingVaults: AddressIndex<OnchainLendingVault>;
@@ -27,6 +29,7 @@ export default class Onchain {
     setPriceInverted(priceInverted: boolean): void;
     getOffchain: () => Offchain;
     getContractHelper: () => OnchainContractsHelper;
+    getPermitHelper: () => OnchainPermitHelper;
     getConfigManager: () => OnchainConfigManager;
     getImpermaxFactory(factory: Factory): OnchainImpermaxFactory;
     getLendingVault(vaultAddress: Address): OnchainLendingVault;

package/lib/onchain/onchain.js

@@ -3,16 +3,19 @@ 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 onchainContractsHelper_1 = __importDefault(require("./onchainContractsHelper"));
-const impermaxFactory_1 = __importDefault(require("./impermaxFactory"));
+const impermaxFactory_1 = require("./impermaxFactory");
 const onchainLendingVault_1 = __importDefault(require("./onchainLendingVault"));
 const account_1 = __importDefault(require("./account"));
 const interactions_1 = __importDefault(require("./interactions"));
 const configManager_1 = __importDefault(require("./configManager"));
+const onchainPermitHelper_1 = __importDefault(require("./onchainPermitHelper"));
 class Onchain {
     constructor(cfg) {
         this.getOffchain = () => this.offchain;
         this.getContractHelper = () => this.contractsHelper;
+        this.getPermitHelper = () => this.permitHelper;
         this.getConfigManager = () => this.configManager;
         this.network = cfg.network;
         this.offchain = cfg.offchain;
@@ -23,6 +26,7 @@ class Onchain {
         this.dust = 1.00000001;
         this.priceInverted = cfg.priceInverted ? cfg.priceInverted : false;
         this.contractsHelper = new onchainContractsHelper_1.default(this);
+        this.permitHelper = new onchainPermitHelper_1.default(this);
         this.configManager = new configManager_1.default(this);
         this.factories = {};
         this.accounts = {};
@@ -47,8 +51,12 @@ class Onchain {
         this.priceInverted = priceInverted;
     }
     getImpermaxFactory(factory) {
-        if (!this.factories[factory])
-            this.factories[factory] = new impermaxFactory_1.default(this, factory);
+        if (!this.factories[factory]) {
+            if (factory == types_1.Factory.V3)
+                this.factories[factory] = new impermaxFactory_1.OnchainImpermaxFactoryV3(this, factory);
+            else
+                this.factories[factory] = new impermaxFactory_1.OnchainImpermaxFactoryV2(this, factory);
+        }
         return this.factories[factory];
     }
     getLendingVault(vaultAddress) {

package/lib/onchain/onchainContractsHelper.d.ts

@@ -10,15 +10,10 @@ export default class OnchainContractsHelper {
     claimAggregator: Contract;
     constructor(onchain: Onchain);
     private newContract;
-    newRouter: (address: Address) => any;
-    newFactory: (address: Address) => any;
-    newSimpleUniswapOracle: (address: Address) => any;
-    newUniswapV2Pair: (address: Address) => any;
-    newUniswapV2Factory: (address: Address) => any;
     newERC20: (address: Address) => any;
-    newCollateral: (address: Address) => any;
-    newBorrowable: (address: Address) => any;
-    newStakedLPToken: (address: Address) => any;
+    newERC721: (address: Address) => any;
+    newPermit2: (address: Address) => any;
+    newPoolTokenRouter: (address: Address) => any;
     newMerkleDistributor: (address: Address) => any;
     newFarmingPool: (address: Address) => any;
     newClaimAggregator: (address: Address) => any;
@@ -28,4 +23,20 @@ export default class OnchainContractsHelper {
     newLendingVault: (address: Address) => any;
     newLendingVaultWatcher: (address: Address) => any;
     newImpermaxConfigManager: (address: Address) => any;
+    newFactoryV2: (address: Address) => any;
+    newSimpleUniswapOracle: (address: Address) => any;
+    newCollateralV2: (address: Address) => any;
+    newBorrowableV2: (address: Address) => any;
+    newStakedLPToken: (address: Address) => any;
+    newRouterV2: (address: Address) => any;
+    newFactoryV3: (address: Address) => any;
+    newBorrowableV3: (address: Address) => any;
+    newCollateralV3: (address: Address) => any;
+    newRouterUniV2: (address: Address) => any;
+    newRouterUniV3: (address: Address) => any;
+    newNftlpUniV2: (address: Address) => any;
+    newNftlpUniV3: (address: Address) => any;
+    newUniswapV2Pair: (address: Address) => any;
+    newUniswapV2Factory: (address: Address) => any;
+    newUniswapV3Pool: (address: Address) => any;
 }

package/lib/onchain/onchainContractsHelper.js

@@ -3,39 +3,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const impermax_chef_1 = require("../config/contracts/impermax-chef");
+const claim_aggregators_1 = require("../config/contracts/claim-aggregators");
+const merkle_distributors_1 = require("../config/contracts/merkle-distributors");
+// Generic
 const IERC20_json_1 = __importDefault(require("../abis/contracts/IERC20.json"));
-const IUniswapV2Pair_json_1 = __importDefault(require("../abis/contracts/IUniswapV2Pair.json"));
-const IUniswapV2Factory_json_1 = __importDefault(require("../abis/contracts/IUniswapV2Factory.json"));
-const IRouter02_json_1 = __importDefault(require("../abis/contracts/IRouter02.json"));
-const IBorrowable_json_1 = __importDefault(require("../abis/contracts/IBorrowable.json"));
-const ICollateral_json_1 = __importDefault(require("../abis/contracts/ICollateral.json"));
-const IStakedLPToken_json_1 = __importDefault(require("../abis/contracts/IStakedLPToken.json"));
-const IFactory_json_1 = __importDefault(require("../abis/contracts/IFactory.json"));
-const ISimpleUniswapOracle_json_1 = __importDefault(require("../abis/contracts/ISimpleUniswapOracle.json"));
+const IERC721_json_1 = __importDefault(require("../abis/contracts/IERC721.json"));
+const IAllowanceTransfer_json_1 = __importDefault(require("../abis/contracts/IAllowanceTransfer.json"));
+// Impermax
+const PoolTokenRouter01_json_1 = __importDefault(require("../abis/contracts/PoolTokenRouter01.json"));
+const ImpermaxChef_json_1 = __importDefault(require("../abis/contracts/ImpermaxChef.json"));
 const IMerkleDistributor_json_1 = __importDefault(require("../abis/contracts/IMerkleDistributor.json"));
 const IFarmingPool_json_1 = __importDefault(require("../abis/contracts/IFarmingPool.json"));
 const ClaimAggregator_json_1 = __importDefault(require("../abis/contracts/ClaimAggregator.json"));
 const IClaimable_json_1 = __importDefault(require("../abis/contracts/IClaimable.json"));
-const IStakingRewards_json_1 = __importDefault(require("../abis/contracts/IStakingRewards.json"));
-const ImpermaxChef_json_1 = __importDefault(require("../abis/contracts/ImpermaxChef.json"));
 const ILendingVaultV1_json_1 = __importDefault(require("../abis/contracts/ILendingVaultV1.json"));
 const LendingVaultWatcher01_json_1 = __importDefault(require("../abis/contracts/LendingVaultWatcher01.json"));
 const ImpermaxConfigManager_json_1 = __importDefault(require("../abis/contracts/ImpermaxConfigManager.json"));
-const impermax_chef_1 = require("../config/contracts/impermax-chef");
-const claim_aggregators_1 = require("../config/contracts/claim-aggregators");
-const merkle_distributors_1 = require("../config/contracts/merkle-distributors");
+// Impermax V2
+const IFactory_json_1 = __importDefault(require("../abis/contracts/IFactory.json"));
+const ISimpleUniswapOracle_json_1 = __importDefault(require("../abis/contracts/ISimpleUniswapOracle.json"));
+const IBorrowable_json_1 = __importDefault(require("../abis/contracts/IBorrowable.json"));
+const ICollateral_json_1 = __importDefault(require("../abis/contracts/ICollateral.json"));
+const IStakedLPToken_json_1 = __importDefault(require("../abis/contracts/IStakedLPToken.json"));
+const IRouter02_json_1 = __importDefault(require("../abis/contracts/IRouter02.json"));
+// Impermax V3
+const ImpermaxV3Factory_json_1 = __importDefault(require("../abis/contracts/ImpermaxV3Factory.json"));
+const ImpermaxV3Borrowable_json_1 = __importDefault(require("../abis/contracts/ImpermaxV3Borrowable.json"));
+const ImpermaxV3Collateral_json_1 = __importDefault(require("../abis/contracts/ImpermaxV3Collateral.json"));
+const ImpermaxV3UniV3Router01_json_1 = __importDefault(require("../abis/contracts/ImpermaxV3UniV3Router01.json"));
+const ImpermaxV3UniV2Router01_json_1 = __importDefault(require("../abis/contracts/ImpermaxV3UniV2Router01.json"));
+// Nftlps
+const ITokenizedUniswapV2Position_json_1 = __importDefault(require("../abis/contracts/ITokenizedUniswapV2Position.json"));
+const ITokenizedUniswapV3Position_json_1 = __importDefault(require("../abis/contracts/ITokenizedUniswapV3Position.json"));
+// External
+const IStakingRewards_json_1 = __importDefault(require("../abis/contracts/IStakingRewards.json"));
+const IUniswapV2Pair_json_1 = __importDefault(require("../abis/contracts/IUniswapV2Pair.json"));
+const IUniswapV2Factory_json_1 = __importDefault(require("../abis/contracts/IUniswapV2Factory.json"));
+const IUniswapV3Pool_json_1 = __importDefault(require("../abis/contracts/IUniswapV3Pool.json"));
 class OnchainContractsHelper {
     constructor(onchain) {
         this.newContract = (abi, address) => new this.onchain.web3.eth.Contract(abi, address);
-        this.newRouter = (address) => this.newContract(IRouter02_json_1.default.abi, address);
-        this.newFactory = (address) => this.newContract(IFactory_json_1.default.abi, address);
-        this.newSimpleUniswapOracle = (address) => this.newContract(ISimpleUniswapOracle_json_1.default.abi, address);
-        this.newUniswapV2Pair = (address) => this.newContract(IUniswapV2Pair_json_1.default.abi, address);
-        this.newUniswapV2Factory = (address) => this.newContract(IUniswapV2Factory_json_1.default.abi, address);
+        // Generic
         this.newERC20 = (address) => this.newContract(IERC20_json_1.default.abi, address);
-        this.newCollateral = (address) => this.newContract(ICollateral_json_1.default.abi, address);
-        this.newBorrowable = (address) => this.newContract(IBorrowable_json_1.default.abi, address);
-        this.newStakedLPToken = (address) => this.newContract(IStakedLPToken_json_1.default.abi, address);
+        this.newERC721 = (address) => this.newContract(IERC721_json_1.default.abi, address);
+        this.newPermit2 = (address) => this.newContract(IAllowanceTransfer_json_1.default.abi, address);
+        // Impermax
+        this.newPoolTokenRouter = (address) => this.newContract(PoolTokenRouter01_json_1.default.abi, address);
         this.newMerkleDistributor = (address) => this.newContract(IMerkleDistributor_json_1.default.abi, address);
         this.newFarmingPool = (address) => this.newContract(IFarmingPool_json_1.default.abi, address);
         this.newClaimAggregator = (address) => this.newContract(ClaimAggregator_json_1.default.abi, address);
@@ -45,6 +59,26 @@ class OnchainContractsHelper {
         this.newLendingVault = (address) => this.newContract(ILendingVaultV1_json_1.default.abi, address);
         this.newLendingVaultWatcher = (address) => this.newContract(LendingVaultWatcher01_json_1.default.abi, address);
         this.newImpermaxConfigManager = (address) => this.newContract(ImpermaxConfigManager_json_1.default.abi, address);
+        // Impermax V2
+        this.newFactoryV2 = (address) => this.newContract(IFactory_json_1.default.abi, address);
+        this.newSimpleUniswapOracle = (address) => this.newContract(ISimpleUniswapOracle_json_1.default.abi, address);
+        this.newCollateralV2 = (address) => this.newContract(ICollateral_json_1.default.abi, address);
+        this.newBorrowableV2 = (address) => this.newContract(IBorrowable_json_1.default.abi, address);
+        this.newStakedLPToken = (address) => this.newContract(IStakedLPToken_json_1.default.abi, address);
+        this.newRouterV2 = (address) => this.newContract(IRouter02_json_1.default.abi, address);
+        // Impermax V3
+        this.newFactoryV3 = (address) => this.newContract(ImpermaxV3Factory_json_1.default.abi, address);
+        this.newBorrowableV3 = (address) => this.newContract(ImpermaxV3Borrowable_json_1.default.abi, address);
+        this.newCollateralV3 = (address) => this.newContract(ImpermaxV3Collateral_json_1.default.abi, address);
+        this.newRouterUniV2 = (address) => this.newContract(ImpermaxV3UniV2Router01_json_1.default.abi, address);
+        this.newRouterUniV3 = (address) => this.newContract(ImpermaxV3UniV3Router01_json_1.default.abi, address);
+        // Nftlps
+        this.newNftlpUniV2 = (address) => this.newContract(ITokenizedUniswapV2Position_json_1.default.abi, address);
+        this.newNftlpUniV3 = (address) => this.newContract(ITokenizedUniswapV3Position_json_1.default.abi, address);
+        // External
+        this.newUniswapV2Pair = (address) => this.newContract(IUniswapV2Pair_json_1.default.abi, address);
+        this.newUniswapV2Factory = (address) => this.newContract(IUniswapV2Factory_json_1.default.abi, address);
+        this.newUniswapV3Pool = (address) => this.newContract(IUniswapV3Pool_json_1.default.abi, address);
         this.onchain = onchain;
         this.impermaxChef = this.newImpermaxChef(impermax_chef_1.IMPERMAX_CHEF[this.onchain.network]);
         this.merkleDistributorIbex = this.newMerkleDistributor(merkle_distributors_1.MERKLE_DISTRIBUTOR_IBEX[this.onchain.network]);

package/lib/onchain/onchainLendingVault.d.ts

@@ -2,7 +2,7 @@ import OnchainPoolToken from "./onchainPoolToken";
 import { Contract } from "ethers";
 import { Address } from '../config/types';
 import Onchain from './index';
-import OffchainLendingVault from '../offchain/offchainLendingVault';
+import OffchainVault from '../offchain/vault/offchainVault';
 export default class OnchainLendingVault extends OnchainPoolToken {
     private readonly onchain;
     private readonly vaultAddress;
@@ -13,8 +13,8 @@ export default class OnchainLendingVault extends OnchainPoolToken {
     getVaultAddress: () => string;
     getContractHelper: () => import("./onchainContractsHelper").default;
     getPoolTokenAddress(): Promise<Address>;
-    getOffchainPoolToken(): Promise<OffchainLendingVault>;
-    getOffchainLendingVault: () => Promise<OffchainLendingVault>;
+    getOffchainPoolToken(): Promise<OffchainVault>;
+    getOffchainLendingVault: () => Promise<OffchainVault>;
     protected initializePoolToken(): Promise<Contract>;
     protected initializeToken(): Promise<Contract>;
     private initializeAvailableLiquidity;

package/lib/onchain/onchainPermitHelper.d.ts

@@ -0,0 +1,21 @@
+import { Contract, Permit, Permits } from "./onchainTypes";
+import Onchain from "./index";
+import { Address } from '../config/types';
+import { BigNumber } from "ethers";
+export default class OnchainPermitHelper {
+    private readonly onchain;
+    private readonly permit2;
+    private readonly deadline;
+    constructor(onchain: Onchain);
+    encodePermits(permits: Permits): string;
+    private getDomainPermit1;
+    private getDomainPermit2;
+    private getTokenPermitJSONData;
+    private getBorrowPermitJSONData;
+    private getNftPermitJSONData;
+    private getPermit2SingleJSONData;
+    private getSignature;
+    getTokenPermit(token: Contract, owner: Address, spender: Address, value: BigNumber, callBack: (permit: Permit | null) => void): Promise<void>;
+    getNftPermit(token: Contract, owner: Address, spender: Address, tokenId: BigNumber, callBack: (permit: Permit | null) => void): Promise<void>;
+    getPermit2Single(token: Contract, owner: Address, spender: Address, value: BigNumber, callBack: (permit: Permit | null) => void): Promise<void>;
+}

package/lib/onchain/onchainPermitHelper.js

@@ -0,0 +1,198 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const general_1 = require("../config/general");
+const PERMIT2_ADDRESS = "0x000000000022D473030F116dDEE9F6B43aC78BA3";
+const EIP712_DOMAIN = [
+    { name: "name", type: "string" },
+    { name: "version", type: "string" },
+    { name: "chainId", type: "uint256" },
+    { name: "verifyingContract", type: "address" },
+];
+const PERMIT2_DOMAIN = [
+    { name: "name", type: "string" },
+    { name: "chainId", type: "uint256" },
+    { name: "verifyingContract", type: "address" },
+];
+const PERMIT = [
+    { name: "owner", type: "address" },
+    { name: "spender", type: "address" },
+    { name: "value", type: "uint256" },
+    { name: "nonce", type: "uint256" },
+    { name: "deadline", type: "uint256" },
+];
+const NFT_PERMIT = [
+    { name: "spender", type: "address" },
+    { name: "tokenId", type: "uint256" },
+    { name: "nonce", type: "uint256" },
+    { name: "deadline", type: "uint256" },
+];
+const PERMIT2_DETAILS = [
+    { name: "token", type: "address" },
+    { name: "amount", type: "uint160" },
+    { name: "expiration", type: "uint48" },
+    { name: "nonce", type: "uint48" },
+];
+const PERMIT2_SINGLE = [
+    { name: "details", type: PERMIT2_DETAILS },
+    { name: "spender", type: "address" },
+    { name: "sigDeadline", type: "uint256" },
+];
+const TYPES = {
+    EIP712Domain: EIP712_DOMAIN,
+    Permit2Domain: PERMIT2_DOMAIN,
+    TokenPermit: PERMIT,
+    BorrowPermit: PERMIT,
+    NftPermit: NFT_PERMIT,
+    PermitDetails: PERMIT2_DETAILS,
+    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 = (contract) => __awaiter(this, void 0, void 0, function* () {
+            return ({
+                name: yield contract.methods.name().call(),
+                version: "1",
+                chainId: this.onchain.chainId,
+                verifyingContract: contract._address,
+            });
+        });
+        this.getDomainPermit2 = () => ({
+            name: 'Permit2',
+            chainId: this.onchain.chainId,
+            verifyingContract: this.permit2._address,
+        });
+        this.onchain = onchain;
+        this.permit2 = onchain.getContractHelper().newPermit2(PERMIT2_ADDRESS);
+    }
+    encodePermits(permits) {
+        if (permits.length == 0 || !permits[0].signature)
+            permits = [];
+        return ethers_1.ethers.utils.defaultAbiCoder.encode(['tuple(uint256 permitType, bytes permitData, bytes signature)[]'], [permits]);
+    }
+    getTokenPermitJSONData(contract, message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const domain = yield this.getDomainPermit1(contract);
+            const primaryType = "TokenPermit";
+            return JSON.stringify({ types: TYPES, domain, primaryType, message });
+        });
+    }
+    getBorrowPermitJSONData(contract, message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const domain = yield this.getDomainPermit1(contract);
+            const primaryType = "BorrowPermit";
+            return JSON.stringify({ types: TYPES, domain, primaryType, message });
+        });
+    }
+    getNftPermitJSONData(contract, message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const domain = yield this.getDomainPermit1(contract);
+            const primaryType = "NftPermit";
+            return JSON.stringify({ types: TYPES, domain, primaryType, message });
+        });
+    }
+    getPermit2SingleJSONData(message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const domain = this.getDomainPermit2();
+            const primaryType = "PermitSingle";
+            return JSON.stringify({ types: TYPES, domain, primaryType, message });
+        });
+    }
+    getSignature(owner, jsonData, callBack) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.onchain.web3.currentProvider.send({
+                method: "eth_signTypedData_v4",
+                params: [owner, jsonData],
+                from: owner
+            }, (err, data) => {
+                if (err) {
+                    console.error(err);
+                    return callBack(null);
+                }
+                callBack(data.result);
+            });
+        });
+    }
+    getTokenPermit(token, owner, spender, value, callBack) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const nonce = yield token.methods.nonces(owner).call();
+            const jsonData = yield this.getTokenPermitJSONData(token, {
+                owner,
+                spender,
+                value: value.toString(),
+                nonce: ethers_1.BigNumber.from(nonce).toHexString(),
+                deadline: this.deadline,
+            });
+            this.getSignature(owner, jsonData, (signature) => {
+                if (!signature)
+                    return callBack(null);
+                callBack({
+                    permitType: '0',
+                    permitData: ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'uint256'], [token.address, value.toString(), this.deadline]),
+                    signature
+                });
+            });
+        });
+    }
+    getNftPermit(token, owner, spender, tokenId, callBack) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const nonce = yield token.methods.nonces(tokenId).call();
+            const jsonData = yield this.getNftPermitJSONData(token, {
+                spender,
+                tokenId: tokenId.toString(),
+                nonce: ethers_1.BigNumber.from(nonce).toHexString(),
+                deadline: this.deadline,
+            });
+            this.getSignature(owner, jsonData, (signature) => {
+                if (!signature)
+                    return callBack(null);
+                callBack({
+                    permitType: '1',
+                    permitData: ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'uint256'], [token.address, tokenId.toString(), this.deadline]),
+                    signature
+                });
+            });
+        });
+    }
+    getPermit2Single(token, owner, spender, value, callBack) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const allowanceData = yield this.permit2.methods.allowance(owner, token.address, spender);
+            if (!allowanceData)
+                return callBack(null);
+            const nonce = allowanceData.nonce;
+            const permitDetailsType = 'tuple(address tokenAddress, uint160 amount, uint48 expiration, uint48 nonce)';
+            const details = {
+                token: token._address,
+                amount: value.toString(),
+                expiration: this.deadline,
+                nonce: ethers_1.BigNumber.from(nonce).toHexString(),
+            };
+            const jsonData = yield this.getPermit2SingleJSONData({
+                details,
+                spender,
+                sigDeadline: this.deadline,
+            });
+            this.getSignature(owner, jsonData, (signature) => {
+                if (!signature)
+                    return callBack(null);
+                callBack({
+                    permitType: '2',
+                    permitData: ethers_1.ethers.utils.defaultAbiCoder.encode([permitDetailsType, 'address', 'uint256'], [token, spender, this.deadline]),
+                    signature
+                });
+            });
+        });
+    }
+}
+exports.default = OnchainPermitHelper;