impermax-sdk 2.1.30 → 2.1.31

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

@@ -21,7 +21,7 @@ export default abstract class OnchainInteractionsPoolToken {
     getPoolTokenAllowance(): Promise<ethers.BigNumber>;
     getUnderlyingAllowance(): Promise<ethers.BigNumber>;
     approvePoolToken(amount: BigNumber, onTransactionHash: Function): Promise<any>;
-    permitPoolToken(amount: BigNumber, callBack: (permit: Permit | null) => void): Promise<void>;
+    permitPoolToken(amount: BigNumber): Promise<Permit>;
     approveUnderlying(amount: BigNumber, onTransactionHash: Function): Promise<any>;
     protected getSendData(permits: Permits): Promise<{
         router: any;

package/lib/onchain/interactions/onchainInteractionsPoolToken.js

@@ -79,11 +79,11 @@ class OnchainInteractionsPoolToken {
             return this.send(poolToken.methods.approve(spender, amount), onTransactionHash);
         });
     }
-    permitPoolToken(amount, callBack) {
+    permitPoolToken(amount) {
         return __awaiter(this, void 0, void 0, function* () {
             const { owner, spender } = this.getOwnerSpender();
             const poolToken = yield this.poolToken.getPoolToken();
-            this.getPermitHelper().getTokenPermit(poolToken, owner, spender, amount, callBack);
+            return this.getPermitHelper().getTokenPermit(poolToken, owner, spender, amount);
         });
     }
     approveUnderlying(amount, onTransactionHash) {

package/lib/onchain/onchainPermitHelper.d.ts

@@ -15,7 +15,7 @@ export default class OnchainPermitHelper {
     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>;
+    getTokenPermit(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

@@ -48,12 +48,20 @@ const PERMIT2_SINGLE = [
     { name: "spender", type: "address" },
     { name: "sigDeadline", type: "uint256" },
 ];
-const TYPES = {
+const TOKEN_PERMIT_TYPES = {
     EIP712Domain: EIP712_DOMAIN,
-    Permit2Domain: PERMIT2_DOMAIN,
     Permit: PERMIT,
+};
+const BORROW_PERMIT_TYPES = {
+    EIP712Domain: EIP712_DOMAIN,
     BorrowPermit: PERMIT,
-    NftPermit: NFT_PERMIT,
+};
+const NFT_PERMIT_TYPES = {
+    EIP712Domain: EIP712_DOMAIN,
+    Permit: NFT_PERMIT,
+};
+const PERMIT2_TYPES = {
+    Permit2Domain: PERMIT2_DOMAIN,
     PermitDetails: PERMIT2_DETAILS,
     PermitSingle: PERMIT2_SINGLE,
 };
@@ -86,47 +94,49 @@ class OnchainPermitHelper {
         return __awaiter(this, void 0, void 0, function* () {
             const domain = yield this.getDomainPermit1(contract);
             const primaryType = "Permit";
-            return JSON.stringify({ types: TYPES, domain, primaryType, message });
+            return JSON.stringify({ types: TOKEN_PERMIT_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 });
+            return JSON.stringify({ types: BORROW_PERMIT_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 });
+            const primaryType = "Permit";
+            return JSON.stringify({ types: NFT_PERMIT_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 });
+            return JSON.stringify({ types: PERMIT2_TYPES, domain, primaryType, message });
         });
     }
-    getSignature(owner, jsonData, callBack) {
+    getSignature(owner, jsonData) {
         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);
-                }
-                console.log("signature", data.result);
-                callBack(data.result);
+            return new Promise((resolve, reject) => {
+                this.onchain.web3.currentProvider.send({
+                    method: "eth_signTypedData_v4",
+                    params: [owner, jsonData],
+                    from: owner
+                }, (err, data) => {
+                    if (err) {
+                        reject(err);
+                    }
+                    else {
+                        resolve(data.result);
+                    }
+                });
             });
         });
     }
-    getTokenPermit(token, owner, spender, value, callBack) {
+    getTokenPermit(token, owner, spender, value) {
         return __awaiter(this, void 0, void 0, function* () {
             const nonce = yield token.methods.nonces(owner).call();
             const jsonData = yield this.getTokenPermitJSONData(token, {
@@ -136,19 +146,14 @@ class OnchainPermitHelper {
                 nonce: ethers_1.BigNumber.from(nonce).toHexString(),
                 deadline: this.deadline,
             });
-            console.log("jsonData", jsonData);
-            this.getSignature(owner, jsonData, (signature) => {
-                if (!signature)
-                    return callBack(null);
-                callBack({
-                    permitType: onchainTypes_1.PermitType.PERMIT1,
-                    permitData: ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'uint256'], [token._address, value.toString(), this.deadline]),
-                    signature
-                });
-            });
+            return {
+                permitType: onchainTypes_1.PermitType.PERMIT1,
+                permitData: ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'uint256'], [token._address, value.toString(), this.deadline]),
+                signature: yield this.getSignature(owner, jsonData)
+            };
         });
     }
-    getNftPermit(token, owner, spender, tokenId, callBack) {
+    getNftPermit(token, owner, spender, tokenId) {
         return __awaiter(this, void 0, void 0, function* () {
             const nonce = yield token.methods.nonces(tokenId).call();
             const jsonData = yield this.getNftPermitJSONData(token, {
@@ -157,22 +162,18 @@ class OnchainPermitHelper {
                 nonce: ethers_1.BigNumber.from(nonce).toHexString(),
                 deadline: this.deadline,
             });
-            this.getSignature(owner, jsonData, (signature) => {
-                if (!signature)
-                    return callBack(null);
-                callBack({
-                    permitType: onchainTypes_1.PermitType.PERMIT_NFT,
-                    permitData: ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'uint256'], [token.address, tokenId.toString(), this.deadline]),
-                    signature
-                });
-            });
+            return {
+                permitType: onchainTypes_1.PermitType.PERMIT_NFT,
+                permitData: ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'uint256'], [token.address, tokenId.toString(), this.deadline]),
+                signature: yield this.getSignature(owner, jsonData)
+            };
         });
     }
-    getPermit2Single(token, owner, spender, value, callBack) {
+    getPermit2Single(token, owner, spender, value) {
         return __awaiter(this, void 0, void 0, function* () {
             const allowanceData = yield this.permit2.methods.allowance(owner, token.address, spender);
             if (!allowanceData)
-                return callBack(null);
+                throw new Error("Invalid permit2 allowance data");
             const nonce = allowanceData.nonce;
             const permitDetailsType = 'tuple(address tokenAddress, uint160 amount, uint48 expiration, uint48 nonce)';
             const details = {
@@ -186,15 +187,11 @@ class OnchainPermitHelper {
                 spender,
                 sigDeadline: this.deadline,
             });
-            this.getSignature(owner, jsonData, (signature) => {
-                if (!signature)
-                    return callBack(null);
-                callBack({
-                    permitType: onchainTypes_1.PermitType.PERMIT2_SINGLE,
-                    permitData: ethers_1.ethers.utils.defaultAbiCoder.encode([permitDetailsType, 'address', 'uint256'], [token, spender, this.deadline]),
-                    signature
-                });
-            });
+            return {
+                permitType: onchainTypes_1.PermitType.PERMIT2_SINGLE,
+                permitData: ethers_1.ethers.utils.defaultAbiCoder.encode([permitDetailsType, 'address', 'uint256'], [token, spender, this.deadline]),
+                signature: yield this.getSignature(owner, jsonData)
+            };
         });
     }
 }

package/package.json

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