@cowprotocol/permit-utils 0.2.0 → 0.3.1

package/README.md

@@ -25,7 +25,7 @@ const permitInfo = await getTokenPermitInfo({
 ```typescript
 import { getPermitUtilsInstance } from "@cowprotocol/permit-utils"
 
-// Using the a static account defined in the library
+// Using a static account defined in the library
 const staticEip2612PermitUtils = getPermitUtilsInstance(chainId, provider)
 
 // Using a provided account address

package/index.cjs

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

package/index.d.ts

@@ -1,7 +1,7 @@
-export { PERMIT_SIGNER, DEFAULT_MIN_GAS_LIMIT } from './const';
+export { DEFAULT_MIN_GAS_LIMIT, PERMIT_SIGNER } from './const';
 export { checkIsCallDataAValidPermit } from './lib/checkIsCallDataAValidPermit';
 export { generatePermitHook } from './lib/generatePermitHook';
 export { getPermitUtilsInstance } from './lib/getPermitUtilsInstance';
 export { getTokenPermitInfo } from './lib/getTokenPermitInfo';
 export { isSupportedPermitInfo } from './utils/isSupportedPermitInfo';
-export type { PermitHookData, PermitHookParams, PermitInfo, PermitType, GetTokenPermitIntoResult } from './types';
+export type { GetTokenPermitIntoResult, PermitHookData, PermitHookParams, PermitInfo, PermitType } from './types';

package/index.js

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

package/lib/generatePermitHook.d.ts

@@ -1,2 +1,2 @@
 import { PermitHookData, PermitHookParams } from '../types';
-export declare function generatePermitHook(params: PermitHookParams): Promise<PermitHookData>;
+export declare function generatePermitHook(params: PermitHookParams): Promise<PermitHookData | undefined>;

package/lib/getPermitUtilsInstance.d.ts

@@ -1,3 +1,3 @@
-import type { JsonRpcProvider } from '@ethersproject/providers';
+import { JsonRpcProvider } from '@ethersproject/providers';
 import { Eip2612PermitUtils } from '@1inch/permit-signed-approvals-utils';
 export declare function getPermitUtilsInstance(chainId: number, provider: JsonRpcProvider, account?: string | undefined): Eip2612PermitUtils;

package/package.json

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

package/types.d.ts

@@ -1,6 +1,6 @@
-import { Eip2612PermitUtils } from '@1inch/permit-signed-approvals-utils';
 import { latest } from '@cowprotocol/app-data';
 import { JsonRpcProvider } from '@ethersproject/providers';
+import { Eip2612PermitUtils } from '@1inch/permit-signed-approvals-utils';
 export type PermitType = 'dai-like' | 'eip-2612' | 'unsupported';
 export type PermitInfo = {
     type: PermitType;

package/utils/PermitProviderConnector.d.ts

@@ -1,6 +1,6 @@
-import type { JsonRpcProvider } from '@ethersproject/providers';
-import { AbiInput, AbiItem, EIP712TypedData, ProviderConnector } from '@1inch/permit-signed-approvals-utils';
+import { JsonRpcProvider } from '@ethersproject/providers';
 import { Wallet } from '@ethersproject/wallet';
+import { AbiInput, AbiItem, EIP712TypedData, ProviderConnector } from '@1inch/permit-signed-approvals-utils';
 export declare class PermitProviderConnector implements ProviderConnector {
     private provider;
     private walletSigner?;

package/utils/getContract.d.ts

@@ -1,3 +1,3 @@
-import type { JsonRpcProvider } from '@ethersproject/providers';
 import { Contract, ContractInterface } from '@ethersproject/contracts';
+import { JsonRpcProvider } from '@ethersproject/providers';
 export declare function getContract(address: string, abi: ContractInterface, provider: JsonRpcProvider): Contract;

package/utils/getEip712Domain.d.ts

@@ -1,4 +1,4 @@
-import type { JsonRpcProvider } from '@ethersproject/providers';
+import { JsonRpcProvider } from '@ethersproject/providers';
 export declare function getEip712Domain(tokenAddress: string, chainId: number, provider: JsonRpcProvider): Promise<Eip712Domain>;
 type Eip5267Return = {
     fields: string;

package/utils/getTokenName.d.ts

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

package/utils/getTokenPermitVersion.d.ts

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