impermax-sdk 2.1.47 → 2.1.48

package/lib/abis/contracts/ERC20.json

@@ -277,6 +277,21 @@
             "stateMutability": "view",
             "type": "function"
         },
+        {
+            "constant": true,
+            "inputs": [],
+            "name": "version",
+            "outputs": [
+                {
+                    "internalType": "string",
+                    "name": "",
+                    "type": "string"
+                }
+            ],
+            "payable": false,
+            "stateMutability": "view",
+            "type": "function"
+        },
         {
             "constant": true,
             "inputs": [],

package/lib/onchain/interactions/onchainInteractionsPoolToken.js

@@ -116,7 +116,12 @@ class OnchainInteractionsPoolToken {
             const token = yield this.poolToken.getToken();
             // experimental feature: check if the token supports permit by getting the DOMAIN_SEPARATOR
             const domain = yield token.methods.DOMAIN_SEPARATOR().call();
-            return this.getPermitHelper().getTokenPermit(token, owner, spender, amount, domain);
+            let version = null;
+            try {
+                version = yield token.methods.version().call();
+            }
+            catch (_a) { }
+            return this.getPermitHelper().getTokenPermit(token, owner, spender, amount, version);
         });
     }
     permit2Underlying(amount) {

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, overrideDomain?: null): Promise<Permit>;
+    getTokenPermit(token: Contract, owner: Address, spender: Address, value: BigNumber, version?: null): 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

@@ -68,10 +68,10 @@ 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* () {
+        this.getDomainPermit1 = (contract, version = null) => __awaiter(this, void 0, void 0, function* () {
             return ({
                 name: yield contract.methods.name().call(),
-                version: "1",
+                version: version ? version : "1",
                 chainId: this.onchain.chainId,
                 verifyingContract: contract._address,
             });
@@ -89,11 +89,10 @@ class OnchainPermitHelper {
             permits = [];
         return ethers_1.ethers.utils.defaultAbiCoder.encode(['tuple(uint256 permitType, bytes permitData, bytes signature)[]'], [permits]);
     }
-    getTokenPermitJSONData(contract, message, overrideDomain = null) {
+    getTokenPermitJSONData(contract, message, version = null) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log("overrideDomain", overrideDomain);
-            console.log("domain", yield this.getDomainPermit1(contract));
-            const domain = !overrideDomain ? overrideDomain : yield this.getDomainPermit1(contract);
+            const domain = yield this.getDomainPermit1(contract, version);
+            console.log(domain);
             const primaryType = "Permit";
             return JSON.stringify({ types: TOKEN_PERMIT_TYPES, domain, primaryType, message });
         });
@@ -138,7 +137,7 @@ class OnchainPermitHelper {
             });
         });
     }
-    getTokenPermit(token, owner, spender, value, overrideDomain = null) {
+    getTokenPermit(token, owner, spender, value, version = null) {
         return __awaiter(this, void 0, void 0, function* () {
             const nonce = yield token.methods.nonces(owner).call();
             const jsonData = yield this.getTokenPermitJSONData(token, {
@@ -147,7 +146,7 @@ class OnchainPermitHelper {
                 value: value.toString(),
                 nonce: ethers_1.BigNumber.from(nonce).toHexString(),
                 deadline: this.deadline,
-            }, overrideDomain);
+            }, version);
             return {
                 permitType: onchainTypes_1.PermitType.PERMIT1,
                 permitData: ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'uint256'], [token._address, value.toString(), this.deadline]),

package/package.json

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