@cowprotocol/permit-utils 0.0.2 → 0.1.1-RC.1

package/const.d.ts

@@ -1,7 +1,6 @@
-import { SupportedChainId } from '@cowprotocol/cow-sdk';
 import { Wallet } from '@ethersproject/wallet';
 export declare const PERMIT_SIGNER: Wallet;
-export declare const PERMIT_GAS_LIMIT_MIN: Record<SupportedChainId, number>;
+export declare const PERMIT_GAS_LIMIT_MIN: Record<number, number>;
 export declare const DEFAULT_PERMIT_GAS_LIMIT = "80000";
 export declare const DEFAULT_PERMIT_VALUE: string;
 export declare const DEFAULT_PERMIT_DURATION: number;

package/index.cjs

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

package/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/permit-utils",
-  "version": "0.0.2",
+  "version": "0.1.1-RC.1",
   "type": "module",
   "dependencies": {
     "ethers": "^5.7.2",

package/types.d.ts

@@ -38,7 +38,6 @@ export type BuildDaiLikePermitCallDataParams = BasePermitCallDataParams & {
 export type GetTokenPermitInfoParams = {
     spender: string;
     tokenAddress: string;
-    tokenName?: string | undefined;
     chainId: number;
     provider: JsonRpcProvider;
 };

package/utils/getEip712Domain.d.ts

@@ -0,0 +1,13 @@
+import type { JsonRpcProvider } from '@ethersproject/providers';
+export declare function getEip712Domain(tokenAddress: string, chainId: number, provider: JsonRpcProvider): Promise<Eip712Domain>;
+type Eip5267Return = {
+    fields: string;
+    name?: string;
+    version?: string;
+    chainId?: string;
+    verifyingContract?: string;
+    salt?: string;
+    extensions?: string[];
+};
+export type Eip712Domain = Omit<Eip5267Return, 'fields' | 'extensions'>;
+export {};

package/utils/fixTokenName.d.ts

@@ -1 +0,0 @@
-export declare function fixTokenName(tokenName: string): string;