@cowprotocol/permit-utils 0.1.2 → 0.2.0

package/abi/versionAbis.d.ts

@@ -0,0 +1,15 @@
+/**
+ * ABIs for fetching the version of different permit flavours
+ */
+export declare const VERSION_ABIS: {
+    constant: boolean;
+    inputs: never[];
+    name: string;
+    outputs: {
+        name: string;
+        type: string;
+    }[];
+    payable: boolean;
+    stateMutability: string;
+    type: string;
+}[][];

package/const.d.ts

@@ -4,4 +4,3 @@ export declare const DEFAULT_MIN_GAS_LIMIT = 55000;
 export declare const DEFAULT_PERMIT_GAS_LIMIT = "80000";
 export declare const DEFAULT_PERMIT_VALUE: string;
 export declare const DEFAULT_PERMIT_DURATION: number;
-export declare const TOKENS_TO_SKIP_VERSION: Set<string>;

package/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const H=require("@ethersproject/constants"),O=require("@ethersproject/wallet"),p=require("@1inch/permit-signed-approvals-utils"),k=require("@ethersproject/abi"),F=require("@ethersproject/bignumber"),x=require("@ethersproject/contracts"),D=require("@ethersproject/address"),G="0x1b80501ea68b883241ac5b9f92e8635aa3df23c89b7bbb87e762be65b8c6eb75",h=new O.Wallet(G),v=55e3,T="80000",S=H.MaxUint256.toString(),q=157788e6,K=new Set(["0x6b175474e89094c44da98b954eedeac495271d0f"]);async function V(r,n,e,a,t,o,{version:c,type:l,name:d}){const s=d||t;if(l==="unsupported")return!1;if(!s)throw new Error(`No token name for ${a}`);const m={chainId:n,tokenName:s,tokenAddress:a,callData:o,version:c};let u;if(o.startsWith(p.EIP_2612_PERMIT_SELECTOR)?u=e.recoverPermitOwnerFromCallData({...m,callData:o.replace(p.EIP_2612_PERMIT_SELECTOR,"0x")}):o.startsWith(p.DAI_PERMIT_SELECTOR)&&(u=e.recoverDaiLikePermitOwnerFromCallData({...m,callData:o.replace(p.DAI_PERMIT_SELECTOR,"0x")})),!!u)try{return(await u).toLowerCase()===r.toLowerCase()}catch(f){return console.debug(`[checkHasValidPendingPermit] Failed to check permit validity for owner ${r} with callData ${o}`,f),!1}}async function L({eip2162Utils:r,callDataParams:n}){const[e,a,t,...o]=n;return(await r.buildPermitCallData(e,a,t,...o)).replace("0x",p.EIP_2612_PERMIT_SELECTOR)}async function R({eip2162Utils:r,callDataParams:n}){return(await r.buildDaiLikePermitCallData(...n)).replace("0x",p.DAI_PERMIT_SELECTOR)}function y(){return Math.ceil((Date.now()+q)/1e3)}function $(r){return!!r&&r.type!=="unsupported"}const P={};async function B(r){const n=Q(r),e=P[n];if(e)try{return await e}catch(t){console.debug("[generatePermitHookWith] cached request failed",t),delete P[n]}const a=j(r).then(t=>(delete P[n],t));return P[n]=a,a}async function j(r){const{inputToken:n,spender:e,chainId:a,permitInfo:t,provider:o,account:c,eip2162Utils:l,nonce:d}=r,s=n.address,m=t.name||n.name;if(!$(t))throw new Error(`Trying to generate permit hook for unsupported token: ${s}`);if(!m)throw new Error(`No token name for token: ${s}`);const u=c||h.address,f=d===void 0?await l.getTokenNonce(s,u):d,i=y(),g=S,w=t.type==="eip-2612"?await L({eip2162Utils:l,callDataParams:[{owner:u,spender:e,value:g,nonce:f,deadline:i},a,m,s,t.version]}):await R({eip2162Utils:l,callDataParams:[{holder:u,spender:e,allowed:!0,value:g,nonce:f,expiry:i},a,m,s,t.version]}),U=await W(w,u,s,o,!!c);return{target:s,callData:w,gasLimit:U}}async function W(r,n,e,a,t){try{const o=await a.estimateGas({data:r,from:n,to:e}),c=t?o:o.add(o.div(10));return c.gt(T)?c.toString():T}catch(o){return console.debug("[calculatePermitGasLimit] Failed to estimateGas, using default",o),T}}function Q(r){const{inputToken:n,chainId:e,account:a}=r;return`${n.address.toLowerCase()}-${e}${a?`-${a.toLowerCase()}`:""}`}function E(r,n,e){return new x.Contract(r,n,e)}class Y{constructor(n,e){this.provider=n,this.walletSigner=e}contractEncodeABI(n,e,a,t){return E(e||"",n,this.provider).interface.encodeFunctionData(a,t)}signTypedData(n,e,a){const t=Object.keys(e.types).reduce((c,l)=>(l!=="EIP712Domain"&&(c[l]=e.types[l]),c),{});return(this.walletSigner||this.provider.getSigner())._signTypedData(e.domain,t,e.message)}ethCall(n,e){return this.provider.call({to:n,data:e})}decodeABIParameter(n,e){return k.defaultAbiCoder.decode([n],e)[0]}decodeABIParameters(n,e){const a=k.defaultAbiCoder.decode(n,e);if(a&&typeof a=="object"){const t={};return Object.keys(a).forEach(o=>{const c=a[o];F.BigNumber.isBigNumber(c)?t[o]=c.toHexString():t[o]=c}),t}return a}}const b=new Map,C=new Map;function M(r,n,e){const a=b.get(r);if(!e&&a)return a;const t=`${r}-${e}`,o=C.get(t);if(o)return o;const c=new Y(n,e?void 0:h),l=new p.Eip2612PermitUtils(c);return e?(console.log(`[getPermitUtilsInstance] Set cached provider utils for chain ${r}-${e}`,l),C.set(t,l)):(console.log(`[getPermitUtilsInstance] Set cached chain utils for chain ${r}`,l),b.set(r,l)),l}const N=[{constant:!0,inputs:[],name:"name",outputs:[{name:"",type:"string"}],payable:!1,stateMutability:"view",type:"function"},{inputs:[],name:"eip712Domain",outputs:[{internalType:"bytes1",name:"fields",type:"bytes1"},{internalType:"string",name:"name",type:"string"},{internalType:"string",name:"version",type:"string"},{internalType:"uint256",name:"chainId",type:"uint256"},{internalType:"address",name:"verifyingContract",type:"address"},{internalType:"bytes32",name:"salt",type:"bytes32"},{internalType:"uint256[]",name:"extensions",type:"uint256[]"}],stateMutability:"view",type:"function"}];async function z(r,n,e){const a=D.getAddress(r),o=await E(a,N,e).callStatic.eip712Domain();return J(o,n,r)}async function J(r,n,e){const{extensions:a,...t}=r;if(a.length>0)throw Error("Extensions not implemented");if(t.chainId&&n!==parseInt(t.chainId,16))throw Error(`ChainId mismatch. Received: '${t.chainId}', expected: '${n}'`);if(t.verifyingContract&&e.toLowerCase()!==t.verifyingContract.toLowerCase())throw Error(`Address mismatch. Received: '${t.verifyingContract}', expected: '${e}'`);return Z(t)}const X=["name","version","chainId","verifyingContract","salt"];function Z(r){const n=parseInt(r.fields,16);return X.reduce((e,a,t)=>(n&1<<t&&(e[a]=r[a]),e),{})}async function ee(r,n,e){const a=D.getAddress(r);return E(a,N,e).callStatic.name()}const te={value:S,nonce:0,deadline:y()},ne={allowed:!0,nonce:0,expiry:y()},_={},I={type:"unsupported"};async function re(r){const{tokenAddress:n,chainId:e}=r,a=`${e}-${n.toLowerCase()}`,t=_[a];if(t)return t;const o=ae(r);return _[a]=o,o}async function ae(r){const{spender:n,tokenAddress:e,chainId:a,provider:t,minGasLimit:o}=r,c=M(a,t),l=h.address;let d;try{d=await z(e,a,t)}catch{console.debug(`[checkTokenIsPermittable] Couldn't fetch eip712domain for token ${e}`)}let s=d==null?void 0:d.name;try{s||(s=await ee(e,a,t))}catch(i){if(/ETIMEDOUT/.test(i)&&!s)return{error:"Failed to fetch token name from contract. RPC connection error"};console.debug(`[checkTokenIsPermittable] Couldn't fetch token name from the contract for token ${e}, using provided '${s}'`,i)}if(!s)return{error:`Token name could not be determined for ${e}`};let m;try{m=await c.getTokenNonce(e,l)}catch(i){return i==="nonce not supported"||i.message==="nonce is NaN"?(console.debug(`[checkTokenIsPermittable] Not a permittable token ${e} - ${s}`,(i==null?void 0:i.message)||i),{...I,name:s}):(console.debug(`[checkTokenIsPermittable] Failed to get nonce for ${e} - ${s}`,i),{error:i.message||i.toString()})}let u=d==null?void 0:d.version;if(!K.has(e)&&u===void 0)try{u=await c.getTokenVersion(e)}catch(i){console.debug(`[checkTokenIsPermittable] Failed to get version for ${e} - ${s}`,i)}const f={chainId:a,eip2612PermitUtils:c,nonce:m,spender:n,tokenAddress:e,tokenName:s,walletAddress:l,version:u,minGasLimit:o};try{return await A({...f,type:"eip-2612",provider:t})}catch(i){try{return await ie(e,c)?await A({...f,type:"dai-like",provider:t}):/invalid signature/.test(i)||(i==null?void 0:i.code)==="UNPREDICTABLE_GAS_LIMIT"?(console.debug(`[checkTokenIsPermittable] Token ${e} - ${s} might be permittable, but it's not supported for now. Reason:`,i==null?void 0:i.reason),{...I,name:s}):(console.debug(`[checkTokenIsPermittable] Failed to estimate eip-2612 permit for ${e} - ${s}`,i),{error:i.message||i.toString()})}catch(g){return console.debug(`[checkTokenIsPermittable] Failed to estimate dai-like permit for ${e} - ${s}`,g),{error:g.message||g.toString()}}}}async function A(r){const{provider:n,walletAddress:e,tokenAddress:a,tokenName:t,type:o,version:c,minGasLimit:l=v}=r,s=await(o==="eip-2612"?oe:se)(r);return s?(await n.estimateGas({data:s,from:e,to:a})).toNumber()>l?{type:o,version:c,name:t}:{...I,name:t}:{...I,name:t}}async function oe(r){const{eip2612PermitUtils:n,walletAddress:e,spender:a,nonce:t,chainId:o,tokenName:c,tokenAddress:l,version:d}=r;return L({eip2162Utils:n,callDataParams:[{...te,owner:e,spender:a,nonce:t},+o,c,l,d]})}async function ie(r,n){return await n.getPermitTypeHash(r)===p.DAI_LIKE_PERMIT_TYPEHASH}async function se(r){const{eip2612PermitUtils:n,tokenAddress:e,walletAddress:a,spender:t,nonce:o,chainId:c,tokenName:l,version:d}=r;return await n.getPermitTypeHash(e)===p.DAI_LIKE_PERMIT_TYPEHASH?R({eip2162Utils:n,callDataParams:[{...ne,holder:a,spender:t,nonce:o},c,l,e,d]}):!1}exports.DEFAULT_MIN_GAS_LIMIT=v;exports.PERMIT_SIGNER=h;exports.checkIsCallDataAValidPermit=V;exports.generatePermitHook=B;exports.getPermitUtilsInstance=M;exports.getTokenPermitInfo=re;exports.isSupportedPermitInfo=$;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const F=require("@ethersproject/constants"),O=require("@ethersproject/wallet"),p=require("@1inch/permit-signed-approvals-utils"),E=require("@ethersproject/abi"),x=require("@ethersproject/bignumber"),G=require("@ethersproject/contracts"),A=require("@ethersproject/address"),q="0x1b80501ea68b883241ac5b9f92e8635aa3df23c89b7bbb87e762be65b8c6eb75",P=new O.Wallet(q),v=55e3,T="80000",S=F.MaxUint256.toString(),V=157788e6;async function B(r,n,e,a,t,i,{version:o,type:l,name:u}){const c=u||t;if(l==="unsupported")return!1;if(!c)throw new Error(`No token name for ${a}`);const m={chainId:n,tokenName:c,tokenAddress:a,callData:i,version:o};let d;if(i.startsWith(p.EIP_2612_PERMIT_SELECTOR)?d=e.recoverPermitOwnerFromCallData({...m,callData:i.replace(p.EIP_2612_PERMIT_SELECTOR,"0x")}):i.startsWith(p.DAI_PERMIT_SELECTOR)&&(d=e.recoverDaiLikePermitOwnerFromCallData({...m,callData:i.replace(p.DAI_PERMIT_SELECTOR,"0x")})),!!d)try{return(await d).toLowerCase()===r.toLowerCase()}catch(f){return console.debug(`[checkHasValidPendingPermit] Failed to check permit validity for owner ${r} with callData ${i}`,f),!1}}async function L({eip2162Utils:r,callDataParams:n}){const[e,a,t,...i]=n;return(await r.buildPermitCallData(e,a,t,...i)).replace("0x",p.EIP_2612_PERMIT_SELECTOR)}async function R({eip2162Utils:r,callDataParams:n}){return(await r.buildDaiLikePermitCallData(...n)).replace("0x",p.DAI_PERMIT_SELECTOR)}function b(){return Math.ceil((Date.now()+V)/1e3)}function $(r){return!!r&&r.type!=="unsupported"}const y={};async function K(r){const n=Q(r),e=y[n];if(e)try{return await e}catch(t){console.debug("[generatePermitHookWith] cached request failed",t),delete y[n]}const a=W(r).then(t=>(delete y[n],t));return y[n]=a,a}async function W(r){const{inputToken:n,spender:e,chainId:a,permitInfo:t,provider:i,account:o,eip2162Utils:l,nonce:u}=r,c=n.address,m=t.name||n.name;if(!$(t))throw new Error(`Trying to generate permit hook for unsupported token: ${c}`);if(!m)throw new Error(`No token name for token: ${c}`);const d=o||P.address,f=u===void 0?await l.getTokenNonce(c,d):u,s=b(),g=S,w=t.type==="eip-2612"?await L({eip2162Utils:l,callDataParams:[{owner:d,spender:e,value:g,nonce:f,deadline:s},a,m,c,t.version]}):await R({eip2162Utils:l,callDataParams:[{holder:d,spender:e,allowed:!0,value:g,nonce:f,expiry:s},a,m,c,t.version]}),H=await j(w,d,c,i,!!o);return{target:c,callData:w,gasLimit:H}}async function j(r,n,e,a,t){try{const i=await a.estimateGas({data:r,from:n,to:e}),o=t?i:i.add(i.div(10));return o.gt(T)?o.toString():T}catch(i){return console.debug("[calculatePermitGasLimit] Failed to estimateGas, using default",i),T}}function Q(r){const{inputToken:n,chainId:e,account:a}=r;return`${n.address.toLowerCase()}-${e}${a?`-${a.toLowerCase()}`:""}`}function h(r,n,e){return new G.Contract(r,n,e)}class Y{constructor(n,e){this.provider=n,this.walletSigner=e}contractEncodeABI(n,e,a,t){return h(e||"",n,this.provider).interface.encodeFunctionData(a,t)}signTypedData(n,e,a){const t=Object.keys(e.types).reduce((o,l)=>(l!=="EIP712Domain"&&(o[l]=e.types[l]),o),{});return(this.walletSigner||this.provider.getSigner())._signTypedData(e.domain,t,e.message)}ethCall(n,e){return this.provider.call({to:n,data:e})}decodeABIParameter(n,e){return E.defaultAbiCoder.decode([n],e)[0]}decodeABIParameters(n,e){const a=E.defaultAbiCoder.decode(n,e);if(a&&typeof a=="object"){const t={};return Object.keys(a).forEach(i=>{const o=a[i];x.BigNumber.isBigNumber(o)?t[i]=o.toHexString():t[i]=o}),t}return a}}const k=new Map,C=new Map;function M(r,n,e){const a=k.get(r);if(!e&&a)return a;const t=`${r}-${e}`,i=C.get(t);if(i)return i;const o=new Y(n,e?void 0:P),l=new p.Eip2612PermitUtils(o);return e?(console.log(`[getPermitUtilsInstance] Set cached provider utils for chain ${r}-${e}`,l),C.set(t,l)):(console.log(`[getPermitUtilsInstance] Set cached chain utils for chain ${r}`,l),k.set(r,l)),l}const N=[{constant:!0,inputs:[],name:"name",outputs:[{name:"",type:"string"}],payable:!1,stateMutability:"view",type:"function"},{inputs:[],name:"eip712Domain",outputs:[{internalType:"bytes1",name:"fields",type:"bytes1"},{internalType:"string",name:"name",type:"string"},{internalType:"string",name:"version",type:"string"},{internalType:"uint256",name:"chainId",type:"uint256"},{internalType:"address",name:"verifyingContract",type:"address"},{internalType:"bytes32",name:"salt",type:"bytes32"},{internalType:"uint256[]",name:"extensions",type:"uint256[]"}],stateMutability:"view",type:"function"}];async function z(r,n,e){const a=A.getAddress(r),i=await h(a,N,e).callStatic.eip712Domain();return J(i,n,r)}async function J(r,n,e){const{extensions:a,...t}=r;if(a.length>0)throw Error("Extensions not implemented");if(t.chainId&&n!==parseInt(t.chainId,16))throw Error(`ChainId mismatch. Received: '${t.chainId}', expected: '${n}'`);if(t.verifyingContract&&e.toLowerCase()!==t.verifyingContract.toLowerCase())throw Error(`Address mismatch. Received: '${t.verifyingContract}', expected: '${e}'`);return Z(t)}const X=["name","version","chainId","verifyingContract","salt"];function Z(r){const n=parseInt(r.fields,16);return X.reduce((e,a,t)=>(n&1<<t&&(e[a]=r[a]),e),{})}async function ee(r,n,e){const a=A.getAddress(r);return h(a,N,e).callStatic.name()}const te=[[{constant:!0,inputs:[],name:"version",outputs:[{name:"",type:"string"}],payable:!1,stateMutability:"view",type:"function"}],[{constant:!0,inputs:[],name:"ERC712_VERSION",outputs:[{name:"",type:"string"}],payable:!1,stateMutability:"view",type:"function"}]];async function U(r,n,e=0){const a=te[e];if(!a)return"1";try{const i=h(r,a,n).interface.encodeFunctionData(a[0].name),o=await n.call({to:r,data:i});return o==="0x"||Number.isNaN(Number(o))?"1":o.startsWith("0x")?E.defaultAbiCoder.decode(["string"],o).toString():o}catch{return U(r,n,e+1)}}const ne={value:S,nonce:0,deadline:b()},re={allowed:!0,nonce:0,expiry:b()},_={},I={type:"unsupported"};async function ae(r){const{tokenAddress:n,chainId:e}=r,a=`${e}-${n.toLowerCase()}`,t=_[a];if(t)return t;const i=ie(r);return _[a]=i,i}async function ie(r){const{spender:n,tokenAddress:e,chainId:a,provider:t,minGasLimit:i}=r,o=M(a,t),l=P.address;let u;try{u=await z(e,a,t)}catch{console.debug(`[checkTokenIsPermittable] Couldn't fetch eip712domain for token ${e}`)}let c=u==null?void 0:u.name;try{c||(c=await ee(e,a,t))}catch(s){if(/ETIMEDOUT/.test(s)&&!c)return{error:"Failed to fetch token name from contract. RPC connection error"};console.debug(`[checkTokenIsPermittable] Couldn't fetch token name from the contract for token ${e}, using provided '${c}'`,s)}if(!c)return{error:`Token name could not be determined for ${e}`};let m;try{m=await o.getTokenNonce(e,l)}catch(s){return s==="nonce not supported"||s.message==="nonce is NaN"?(console.debug(`[checkTokenIsPermittable] Not a permittable token ${e} - ${c}`,(s==null?void 0:s.message)||s),{...I,name:c}):(console.debug(`[checkTokenIsPermittable] Failed to get nonce for ${e} - ${c}`,s),{error:s.message||s.toString()})}let d=u==null?void 0:u.version;if(d===void 0)try{d=await U(e,t)}catch(s){console.debug(`[checkTokenIsPermittable] Failed to get version for ${e} - ${c}`,s)}const f={chainId:a,eip2612PermitUtils:o,nonce:m,spender:n,tokenAddress:e,tokenName:c,walletAddress:l,version:d,minGasLimit:i};try{return await D({...f,type:"eip-2612",provider:t})}catch(s){try{return await se(e,o)?await D({...f,type:"dai-like",provider:t}):/invalid signature/.test(s)||(s==null?void 0:s.code)==="UNPREDICTABLE_GAS_LIMIT"?(console.debug(`[checkTokenIsPermittable] Token ${e} - ${c} might be permittable, but it's not supported for now. Reason:`,s==null?void 0:s.reason),{...I,name:c}):(console.debug(`[checkTokenIsPermittable] Failed to estimate eip-2612 permit for ${e} - ${c}`,s),{error:s.message||s.toString()})}catch(g){return console.debug(`[checkTokenIsPermittable] Failed to estimate dai-like permit for ${e} - ${c}`,g),{error:g.message||g.toString()}}}}async function D(r){const{provider:n,walletAddress:e,tokenAddress:a,tokenName:t,type:i,version:o,minGasLimit:l=v}=r,c=await(i==="eip-2612"?oe:ce)(r);return c?(await n.estimateGas({data:c,from:e,to:a})).toNumber()>l?{type:i,version:o,name:t}:{...I,name:t}:{...I,name:t}}async function oe(r){const{eip2612PermitUtils:n,walletAddress:e,spender:a,nonce:t,chainId:i,tokenName:o,tokenAddress:l,version:u}=r;return L({eip2162Utils:n,callDataParams:[{...ne,owner:e,spender:a,nonce:t},+i,o,l,u]})}async function se(r,n){return await n.getPermitTypeHash(r)===p.DAI_LIKE_PERMIT_TYPEHASH}async function ce(r){const{eip2612PermitUtils:n,tokenAddress:e,walletAddress:a,spender:t,nonce:i,chainId:o,tokenName:l,version:u}=r;return await n.getPermitTypeHash(e)===p.DAI_LIKE_PERMIT_TYPEHASH?R({eip2162Utils:n,callDataParams:[{...re,holder:a,spender:t,nonce:i},o,l,e,u]}):!1}exports.DEFAULT_MIN_GAS_LIMIT=v;exports.PERMIT_SIGNER=P;exports.checkIsCallDataAValidPermit=B;exports.generatePermitHook=K;exports.getPermitUtilsInstance=M;exports.getTokenPermitInfo=ae;exports.isSupportedPermitInfo=$;

package/index.js

@@ -1,42 +1,42 @@
-import { MaxUint256 as M } from "@ethersproject/constants";
-import { Wallet as H } from "@ethersproject/wallet";
-import { EIP_2612_PERMIT_SELECTOR as P, DAI_PERMIT_SELECTOR as w, Eip2612PermitUtils as F, DAI_LIKE_PERMIT_TYPEHASH as _ } from "@1inch/permit-signed-approvals-utils";
-import { defaultAbiCoder as E } from "@ethersproject/abi";
-import { BigNumber as x } from "@ethersproject/bignumber";
-import { Contract as O } from "@ethersproject/contracts";
+import { MaxUint256 as H } from "@ethersproject/constants";
+import { Wallet as F } from "@ethersproject/wallet";
+import { EIP_2612_PERMIT_SELECTOR as w, DAI_PERMIT_SELECTOR as I, Eip2612PermitUtils as x, DAI_LIKE_PERMIT_TYPEHASH as _ } from "@1inch/permit-signed-approvals-utils";
+import { defaultAbiCoder as T } from "@ethersproject/abi";
+import { BigNumber as O } from "@ethersproject/bignumber";
+import { Contract as G } from "@ethersproject/contracts";
 import { getAddress as L } from "@ethersproject/address";
-const G = "0x1b80501ea68b883241ac5b9f92e8635aa3df23c89b7bbb87e762be65b8c6eb75", T = new H(G), K = 55e3, y = "80000", $ = M.toString(), B = 157788e6, V = /* @__PURE__ */ new Set(["0x6b175474e89094c44da98b954eedeac495271d0f"]);
-async function ge(r, n, e, a, t, o, {
-  version: c,
+const B = "0x1b80501ea68b883241ac5b9f92e8635aa3df23c89b7bbb87e762be65b8c6eb75", b = new F(B), V = 55e3, P = "80000", $ = H.toString(), K = 157788e6;
+async function ye(r, n, e, a, t, o, {
+  version: i,
   type: l,
-  name: d
+  name: u
 }) {
-  const s = d || t;
+  const c = u || t;
   if (l === "unsupported")
     return !1;
-  if (!s)
+  if (!c)
     throw new Error(`No token name for ${a}`);
-  const u = {
+  const m = {
     chainId: n,
-    tokenName: s,
+    tokenName: c,
     tokenAddress: a,
     callData: o,
-    version: c
+    version: i
   };
-  let m;
-  if (o.startsWith(P) ? m = e.recoverPermitOwnerFromCallData({
-    ...u,
+  let d;
+  if (o.startsWith(w) ? d = e.recoverPermitOwnerFromCallData({
+    ...m,
     // I don't know why this was removed, ok?
     // We added it back on buildPermitCallData.ts
     // But it looks like this is needed 🤷
     // Check the test for this method https://github.com/1inch/permit-signed-approvals-utils/blob/master/src/eip-2612-permit.test.ts#L85-L106
-    callData: o.replace(P, "0x")
-  }) : o.startsWith(w) && (m = e.recoverDaiLikePermitOwnerFromCallData({
-    ...u,
     callData: o.replace(w, "0x")
-  })), !!m)
+  }) : o.startsWith(I) && (d = e.recoverDaiLikePermitOwnerFromCallData({
+    ...m,
+    callData: o.replace(I, "0x")
+  })), !!d)
     try {
-      return (await m).toLowerCase() === r.toLowerCase();
+      return (await d).toLowerCase() === r.toLowerCase();
     } catch (p) {
       return console.debug(`[checkHasValidPendingPermit] Failed to check permit validity for owner ${r} with callData ${o}`, p), !1;
     }
@@ -46,18 +46,18 @@ async function S({
   callDataParams: n
 }) {
   const [e, a, t, ...o] = n;
-  return (await r.buildPermitCallData(e, a, t, ...o)).replace("0x", P);
+  return (await r.buildPermitCallData(e, a, t, ...o)).replace("0x", w);
 }
-async function R({
+async function N({
   eip2162Utils: r,
   callDataParams: n
 }) {
-  return (await r.buildDaiLikePermitCallData(...n)).replace("0x", w);
+  return (await r.buildDaiLikePermitCallData(...n)).replace("0x", I);
 }
-function I() {
-  return Math.ceil((Date.now() + B) / 1e3);
+function k() {
+  return Math.ceil((Date.now() + K) / 1e3);
 }
-function q(r) {
+function W(r) {
   return !!r && r.type !== "unsupported";
 }
 const g = {};
@@ -69,47 +69,47 @@ async function he(r) {
     } catch (t) {
       console.debug("[generatePermitHookWith] cached request failed", t), delete g[n];
     }
-  const a = W(r).then((t) => (delete g[n], t));
+  const a = q(r).then((t) => (delete g[n], t));
   return g[n] = a, a;
 }
-async function W(r) {
+async function q(r) {
   const {
     inputToken: n,
     spender: e,
     chainId: a,
     permitInfo: t,
     provider: o,
-    account: c,
+    account: i,
     eip2162Utils: l,
-    nonce: d
-  } = r, s = n.address, u = t.name || n.name;
-  if (!q(t))
-    throw new Error(`Trying to generate permit hook for unsupported token: ${s}`);
-  if (!u)
-    throw new Error(`No token name for token: ${s}`);
-  const m = c || T.address, p = d === void 0 ? await l.getTokenNonce(s, m) : d, i = I(), f = $, b = t.type === "eip-2612" ? await S({
+    nonce: u
+  } = r, c = n.address, m = t.name || n.name;
+  if (!W(t))
+    throw new Error(`Trying to generate permit hook for unsupported token: ${c}`);
+  if (!m)
+    throw new Error(`No token name for token: ${c}`);
+  const d = i || b.address, p = u === void 0 ? await l.getTokenNonce(c, d) : u, s = k(), f = $, E = t.type === "eip-2612" ? await S({
     eip2162Utils: l,
     callDataParams: [{
-      owner: m,
+      owner: d,
       spender: e,
       value: f,
       nonce: p,
-      deadline: i
-    }, a, u, s, t.version]
-  }) : await R({
+      deadline: s
+    }, a, m, c, t.version]
+  }) : await N({
     eip2162Utils: l,
     callDataParams: [{
-      holder: m,
+      holder: d,
       spender: e,
       allowed: !0,
       value: f,
       nonce: p,
-      expiry: i
-    }, a, u, s, t.version]
-  }), U = await j(b, m, s, o, !!c);
+      expiry: s
+    }, a, m, c, t.version]
+  }), U = await j(E, d, c, o, !!i);
   return {
-    target: s,
-    callData: b,
+    target: c,
+    callData: E,
     gasLimit: U
   };
 }
@@ -119,10 +119,10 @@ async function j(r, n, e, a, t) {
       data: r,
       from: n,
       to: e
-    }), c = t ? o : o.add(o.div(10));
-    return c.gt(y) ? c.toString() : y;
+    }), i = t ? o : o.add(o.div(10));
+    return i.gt(P) ? i.toString() : P;
   } catch (o) {
-    return console.debug("[calculatePermitGasLimit] Failed to estimateGas, using default", o), y;
+    return console.debug("[calculatePermitGasLimit] Failed to estimateGas, using default", o), P;
   }
 }
 function Q(r) {
@@ -133,18 +133,18 @@ function Q(r) {
   } = r;
   return `${n.address.toLowerCase()}-${e}${a ? `-${a.toLowerCase()}` : ""}`;
 }
-function k(r, n, e) {
-  return new O(r, n, e);
+function h(r, n, e) {
+  return new G(r, n, e);
 }
 class Y {
   constructor(n, e) {
     this.provider = n, this.walletSigner = e;
   }
   contractEncodeABI(n, e, a, t) {
-    return k(e || "", n, this.provider).interface.encodeFunctionData(a, t);
+    return h(e || "", n, this.provider).interface.encodeFunctionData(a, t);
   }
   signTypedData(n, e, a) {
-    const t = Object.keys(e.types).reduce((c, l) => (l !== "EIP712Domain" && (c[l] = e.types[l]), c), {});
+    const t = Object.keys(e.types).reduce((i, l) => (l !== "EIP712Domain" && (i[l] = e.types[l]), i), {});
     return (this.walletSigner || this.provider.getSigner())._signTypedData(e.domain, t, e.message);
   }
   ethCall(n, e) {
@@ -154,15 +154,15 @@ class Y {
     });
   }
   decodeABIParameter(n, e) {
-    return E.decode([n], e)[0];
+    return T.decode([n], e)[0];
   }
   decodeABIParameters(n, e) {
-    const a = E.decode(n, e);
+    const a = T.decode(n, e);
     if (a && typeof a == "object") {
       const t = {};
       return Object.keys(a).forEach((o) => {
-        const c = a[o];
-        x.isBigNumber(c) ? t[o] = c.toHexString() : t[o] = c;
+        const i = a[o];
+        O.isBigNumber(i) ? t[o] = i.toHexString() : t[o] = i;
       }), t;
     }
     return a;
@@ -176,10 +176,10 @@ function z(r, n, e) {
   const t = `${r}-${e}`, o = v.get(t);
   if (o)
     return o;
-  const c = new Y(n, e ? void 0 : T), l = new F(c);
+  const i = new Y(n, e ? void 0 : b), l = new x(i);
   return e ? (console.log(`[getPermitUtilsInstance] Set cached provider utils for chain ${r}-${e}`, l), v.set(t, l)) : (console.log(`[getPermitUtilsInstance] Set cached chain utils for chain ${r}`, l), C.set(r, l)), l;
 }
-const N = [
+const R = [
   {
     constant: !0,
     inputs: [],
@@ -239,7 +239,7 @@ const N = [
   }
 ];
 async function J(r, n, e) {
-  const a = L(r), o = await k(a, N, e).callStatic.eip712Domain();
+  const a = L(r), o = await h(a, R, e).callStatic.eip712Domain();
   return X(o, n, r);
 }
 async function X(r, n, e) {
@@ -262,84 +262,121 @@ function ee(r) {
 }
 async function te(r, n, e) {
   const a = L(r);
-  return k(a, N, e).callStatic.name();
+  return h(a, R, e).callStatic.name();
 }
-const ne = {
+const ne = [[{
+  constant: !0,
+  inputs: [],
+  name: "version",
+  outputs: [{
+    name: "",
+    type: "string"
+  }],
+  payable: !1,
+  stateMutability: "view",
+  type: "function"
+}], [{
+  constant: !0,
+  inputs: [],
+  name: "ERC712_VERSION",
+  outputs: [{
+    name: "",
+    type: "string"
+  }],
+  payable: !1,
+  stateMutability: "view",
+  type: "function"
+}]];
+async function M(r, n, e = 0) {
+  const a = ne[e];
+  if (!a)
+    return "1";
+  try {
+    const o = h(r, a, n).interface.encodeFunctionData(a[0].name), i = await n.call({
+      to: r,
+      data: o
+    });
+    return i === "0x" || Number.isNaN(Number(i)) ? "1" : i.startsWith("0x") ? T.decode(["string"], i).toString() : i;
+  } catch {
+    return M(r, n, e + 1);
+  }
+}
+const re = {
   value: $,
   nonce: 0,
-  deadline: I()
-}, re = {
+  deadline: k()
+}, ae = {
   allowed: !0,
   nonce: 0,
-  expiry: I()
-}, D = {}, h = {
+  expiry: k()
+}, D = {}, y = {
   type: "unsupported"
 };
-async function ye(r) {
+async function Pe(r) {
   const {
     tokenAddress: n,
     chainId: e
   } = r, a = `${e}-${n.toLowerCase()}`, t = D[a];
   if (t)
     return t;
-  const o = ae(r);
+  const o = oe(r);
   return D[a] = o, o;
 }
-async function ae(r) {
+async function oe(r) {
   const {
     spender: n,
     tokenAddress: e,
     chainId: a,
     provider: t,
     minGasLimit: o
-  } = r, c = z(a, t), l = T.address;
-  let d;
+  } = r, i = z(a, t), l = b.address;
+  let u;
   try {
-    d = await J(e, a, t);
+    u = await J(e, a, t);
   } catch {
     console.debug(`[checkTokenIsPermittable] Couldn't fetch eip712domain for token ${e}`);
   }
-  let s = d == null ? void 0 : d.name;
+  let c = u == null ? void 0 : u.name;
   try {
-    s || (s = await te(e, a, t));
-  } catch (i) {
-    if (/ETIMEDOUT/.test(i) && !s)
+    c || (c = await te(e, a, t));
+  } catch (s) {
+    if (/ETIMEDOUT/.test(s) && !c)
       return {
         error: "Failed to fetch token name from contract. RPC connection error"
       };
-    console.debug(`[checkTokenIsPermittable] Couldn't fetch token name from the contract for token ${e}, using provided '${s}'`, i);
+    console.debug(`[checkTokenIsPermittable] Couldn't fetch token name from the contract for token ${e}, using provided '${c}'`, s);
   }
-  if (!s)
+  if (!c)
     return {
       error: `Token name could not be determined for ${e}`
     };
-  let u;
+  let m;
   try {
-    u = await c.getTokenNonce(e, l);
-  } catch (i) {
-    return i === "nonce not supported" || i.message === "nonce is NaN" ? (console.debug(`[checkTokenIsPermittable] Not a permittable token ${e} - ${s}`, (i == null ? void 0 : i.message) || i), {
-      ...h,
-      name: s
-    }) : (console.debug(`[checkTokenIsPermittable] Failed to get nonce for ${e} - ${s}`, i), {
-      error: i.message || i.toString()
+    m = await i.getTokenNonce(e, l);
+  } catch (s) {
+    return s === "nonce not supported" || s.message === "nonce is NaN" ? (console.debug(`[checkTokenIsPermittable] Not a permittable token ${e} - ${c}`, (s == null ? void 0 : s.message) || s), {
+      ...y,
+      name: c
+    }) : (console.debug(`[checkTokenIsPermittable] Failed to get nonce for ${e} - ${c}`, s), {
+      error: s.message || s.toString()
     });
   }
-  let m = d == null ? void 0 : d.version;
-  if (!V.has(e) && m === void 0)
+  let d = u == null ? void 0 : u.version;
+  if (d === void 0)
     try {
-      m = await c.getTokenVersion(e);
-    } catch (i) {
-      console.debug(`[checkTokenIsPermittable] Failed to get version for ${e} - ${s}`, i);
+      d = await M(e, t);
+    } catch (s) {
+      console.debug(`[checkTokenIsPermittable] Failed to get version for ${e} - ${c}`, s);
     }
   const p = {
     chainId: a,
-    eip2612PermitUtils: c,
-    nonce: u,
+    eip2612PermitUtils: i,
+    nonce: m,
     spender: n,
     tokenAddress: e,
-    tokenName: s,
+    tokenName: c,
     walletAddress: l,
-    version: m,
+    version: d,
     minGasLimit: o
   };
   try {
@@ -348,20 +385,20 @@ async function ae(r) {
       type: "eip-2612",
       provider: t
     });
-  } catch (i) {
+  } catch (s) {
     try {
-      return await ie(e, c) ? await A({
+      return await se(e, i) ? await A({
         ...p,
         type: "dai-like",
         provider: t
-      }) : /invalid signature/.test(i) || (i == null ? void 0 : i.code) === "UNPREDICTABLE_GAS_LIMIT" ? (console.debug(`[checkTokenIsPermittable] Token ${e} - ${s} might be permittable, but it's not supported for now. Reason:`, i == null ? void 0 : i.reason), {
-        ...h,
-        name: s
-      }) : (console.debug(`[checkTokenIsPermittable] Failed to estimate eip-2612 permit for ${e} - ${s}`, i), {
-        error: i.message || i.toString()
+      }) : /invalid signature/.test(s) || (s == null ? void 0 : s.code) === "UNPREDICTABLE_GAS_LIMIT" ? (console.debug(`[checkTokenIsPermittable] Token ${e} - ${c} might be permittable, but it's not supported for now. Reason:`, s == null ? void 0 : s.reason), {
+        ...y,
+        name: c
+      }) : (console.debug(`[checkTokenIsPermittable] Failed to estimate eip-2612 permit for ${e} - ${c}`, s), {
+        error: s.message || s.toString()
       });
     } catch (f) {
-      return console.debug(`[checkTokenIsPermittable] Failed to estimate dai-like permit for ${e} - ${s}`, f), {
+      return console.debug(`[checkTokenIsPermittable] Failed to estimate dai-like permit for ${e} - ${c}`, f), {
         error: f.message || f.toString()
       };
     }
@@ -374,76 +411,76 @@ async function A(r) {
     tokenAddress: a,
     tokenName: t,
     type: o,
-    version: c,
-    minGasLimit: l = K
-  } = r, s = await (o === "eip-2612" ? oe : se)(r);
-  return s ? (await n.estimateGas({
-    data: s,
+    version: i,
+    minGasLimit: l = V
+  } = r, c = await (o === "eip-2612" ? ie : ce)(r);
+  return c ? (await n.estimateGas({
+    data: c,
     from: e,
     to: a
   })).toNumber() > l ? {
     type: o,
-    version: c,
+    version: i,
     name: t
   } : {
-    ...h,
+    ...y,
     name: t
   } : {
-    ...h,
+    ...y,
     name: t
   };
 }
-async function oe(r) {
+async function ie(r) {
   const {
     eip2612PermitUtils: n,
     walletAddress: e,
     spender: a,
     nonce: t,
     chainId: o,
-    tokenName: c,
+    tokenName: i,
     tokenAddress: l,
-    version: d
+    version: u
   } = r;
   return S({
     eip2162Utils: n,
     callDataParams: [{
-      ...ne,
+      ...re,
       owner: e,
       spender: a,
       nonce: t
-    }, +o, c, l, d]
+    }, +o, i, l, u]
   });
 }
-async function ie(r, n) {
+async function se(r, n) {
   return await n.getPermitTypeHash(r) === _;
 }
-async function se(r) {
+async function ce(r) {
   const {
     eip2612PermitUtils: n,
     tokenAddress: e,
     walletAddress: a,
     spender: t,
     nonce: o,
-    chainId: c,
+    chainId: i,
     tokenName: l,
-    version: d
+    version: u
   } = r;
-  return await n.getPermitTypeHash(e) === _ ? R({
+  return await n.getPermitTypeHash(e) === _ ? N({
     eip2162Utils: n,
     callDataParams: [{
-      ...re,
+      ...ae,
       holder: a,
       spender: t,
       nonce: o
-    }, c, l, e, d]
+    }, i, l, e, u]
   }) : !1;
 }
 export {
-  K as DEFAULT_MIN_GAS_LIMIT,
-  T as PERMIT_SIGNER,
-  ge as checkIsCallDataAValidPermit,
+  V as DEFAULT_MIN_GAS_LIMIT,
+  b as PERMIT_SIGNER,
+  ye as checkIsCallDataAValidPermit,
   he as generatePermitHook,
   z as getPermitUtilsInstance,
-  ye as getTokenPermitInfo,
-  q as isSupportedPermitInfo
+  Pe as getTokenPermitInfo,
+  W as isSupportedPermitInfo
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/permit-utils",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "type": "module",
   "dependencies": {
     "ethers": "^5.7.2",

package/utils/getTokenPermitVersion.d.ts

@@ -0,0 +1,2 @@
+import type { JsonRpcProvider } from '@ethersproject/providers';
+export declare function getTokenPermitVersion(tokenAddress: string, provider: JsonRpcProvider, index?: number): Promise<string>;