@cowprotocol/permit-utils 0.0.1 → 0.1.1-RC.0

package/const.d.ts

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

package/index.d.ts

@@ -1,3 +1,4 @@
+export { PERMIT_SIGNER } from './const';
 export { checkIsCallDataAValidPermit } from './lib/checkIsCallDataAValidPermit';
 export { generatePermitHook } from './lib/generatePermitHook';
 export { getPermitUtilsInstance } from './lib/getPermitUtilsInstance';

package/index.js

@@ -1,192 +1,191 @@
-import { EIP_2612_PERMIT_SELECTOR as h, DAI_PERMIT_SELECTOR as k, Eip2612PermitUtils as U, DAI_LIKE_PERMIT_TYPEHASH as A } from "@1inch/permit-signed-approvals-utils";
-import { MaxUint256 as M } from "@ethersproject/constants";
-import { Wallet as H } from "@ethersproject/wallet";
-import { defaultAbiCoder as y } from "@ethersproject/abi";
-import { BigNumber as F } from "@ethersproject/bignumber";
-import { Contract as O } from "@ethersproject/contracts";
-import { getAddress as x } from "@ethersproject/address";
-function v(t) {
-  return t === "USD//C" ? "USD Coin" : t;
-}
-async function ue(t, n, e, o, a, r, {
-  version: i,
-  type: c,
+import { SupportedChainId as f } from "@cowprotocol/cow-sdk";
+import { MaxUint256 as O } from "@ethersproject/constants";
+import { Wallet as F } from "@ethersproject/wallet";
+import { EIP_2612_PERMIT_SELECTOR as P, DAI_PERMIT_SELECTOR as T, Eip2612PermitUtils as x, DAI_LIKE_PERMIT_TYPEHASH as L } from "@1inch/permit-signed-approvals-utils";
+import { defaultAbiCoder as v } from "@ethersproject/abi";
+import { BigNumber as G } from "@ethersproject/bignumber";
+import { Contract as K } from "@ethersproject/contracts";
+import { getAddress as $ } from "@ethersproject/address";
+const B = "0x4dae303b820e9878cafeb0f84edcc015e8a81b1bff510e824e4fc27544e458dd", w = new F(B), y = 55e3, V = {
+  [f.MAINNET]: y,
+  [f.GNOSIS_CHAIN]: y,
+  [f.SEPOLIA]: y,
+  [f.GOERLI]: 36e3
+}, I = "80000", N = O.toString(), q = 157788e6, W = /* @__PURE__ */ new Set(["0x6b175474e89094c44da98b954eedeac495271d0f"]);
+async function Ie(r, t, e, o, n, a, {
+  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}`);
   const u = {
-    chainId: n,
-    tokenName: v(d),
+    chainId: t,
+    tokenName: d,
     tokenAddress: o,
-    callData: r,
-    version: i
+    callData: a,
+    version: c
   };
   let m;
-  if (r.startsWith(h) ? m = e.recoverPermitOwnerFromCallData({
+  if (a.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(h, "0x")
-  }) : r.startsWith(k) && (m = e.recoverDaiLikePermitOwnerFromCallData({
+    callData: a.replace(P, "0x")
+  }) : a.startsWith(T) && (m = e.recoverDaiLikePermitOwnerFromCallData({
     ...u,
-    callData: r.replace(k, "0x")
+    callData: a.replace(T, "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 ${a}`, i), !1;
     }
 }
-const G = "0xec10458cfaafb32533a4a27e18d9da345758094dde7052521b939a41c55dd1b0", w = new H(G), K = {
-  1: 55e3,
-  100: 55e3,
-  5: 36e3
-}, P = "80000", S = M.toString(), V = 157788e6, B = /* @__PURE__ */ new Set(["0x6b175474e89094c44da98b954eedeac495271d0f"]);
-async function L({
-  eip2162Utils: t,
-  callDataParams: n
+async function R({
+  eip2162Utils: r,
+  callDataParams: t
 }) {
-  const [e, o, a, ...r] = n;
-  return (await t.buildPermitCallData(e, o, v(a), ...r)).replace("0x", h);
+  const [e, o, n, ...a] = t;
+  return (await r.buildPermitCallData(e, o, n, ...a)).replace("0x", P);
 }
-async function $({
-  eip2162Utils: t,
-  callDataParams: n
+async function M({
+  eip2162Utils: r,
+  callDataParams: t
 }) {
-  return (await t.buildDaiLikePermitCallData(...n)).replace("0x", k);
+  return (await r.buildDaiLikePermitCallData(...t)).replace("0x", T);
 }
-function T() {
-  return Math.ceil((Date.now() + V) / 1e3);
+function k() {
+  return Math.ceil((Date.now() + q) / 1e3);
 }
-function q(t) {
-  return !!t && t.type !== "unsupported";
+function j(r) {
+  return !!r && r.type !== "unsupported";
 }
-const f = {};
-async function pe(t) {
-  const n = Q(t), e = f[n];
+const h = {};
+async function Pe(r) {
+  const t = z(r), e = h[t];
   if (e)
     try {
       return await e;
-    } catch (a) {
-      console.debug("[generatePermitHookWith] cached request failed", a), delete f[n];
+    } catch (n) {
+      console.debug("[generatePermitHookWith] cached request failed", n), delete h[t];
     }
-  const o = W(t).then((a) => (delete f[n], a));
-  return f[n] = o, o;
+  const o = Q(r).then((n) => (delete h[t], n));
+  return h[t] = o, o;
 }
-async function W(t) {
+async function Q(r) {
   const {
-    inputToken: n,
+    inputToken: t,
     spender: e,
     chainId: o,
-    permitInfo: a,
-    provider: r,
-    account: i,
-    eip2162Utils: c,
+    permitInfo: n,
+    provider: a,
+    account: c,
+    eip2162Utils: s,
     nonce: l
-  } = t, d = n.address, u = a.name || n.name;
-  if (!q(a))
+  } = r, d = t.address, u = n.name || t.name;
+  if (!j(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 || w.address, s = l === void 0 ? await c.getTokenNonce(d, m) : l, p = T(), I = S, E = a.type === "eip-2612" ? await L({
-    eip2162Utils: c,
+  const m = c || w.address, i = l === void 0 ? await s.getTokenNonce(d, m) : l, p = k(), C = N, b = n.type === "eip-2612" ? await R({
+    eip2162Utils: s,
     callDataParams: [{
       owner: m,
       spender: e,
-      value: I,
-      nonce: s,
+      value: C,
+      nonce: i,
       deadline: p
-    }, o, u, d, a.version]
-  }) : await $({
-    eip2162Utils: c,
+    }, o, u, d, n.version]
+  }) : await M({
+    eip2162Utils: s,
     callDataParams: [{
       holder: m,
       spender: e,
       allowed: !0,
-      value: I,
-      nonce: s,
+      value: C,
+      nonce: i,
       expiry: p
-    }, o, u, d, a.version]
-  }), R = await j(E, m, d, r, !!i);
+    }, o, u, d, n.version]
+  }), H = await Y(b, m, d, a, !!c);
   return {
     target: d,
-    callData: E,
-    gasLimit: R
+    callData: b,
+    gasLimit: H
   };
 }
-async function j(t, n, e, o, a) {
+async function Y(r, t, e, o, n) {
   try {
-    const r = await o.estimateGas({
-      data: t,
-      from: n,
+    const a = await o.estimateGas({
+      data: r,
+      from: t,
       to: e
-    }), i = a ? r : r.add(r.div(10));
-    return i.gt(P) ? i.toString() : P;
-  } catch (r) {
-    return console.debug("[calculatePermitGasLimit] Failed to estimateGas, using default", r), P;
+    }), c = n ? a : a.add(a.div(10));
+    return c.gt(I) ? c.toString() : I;
+  } catch (a) {
+    return console.debug("[calculatePermitGasLimit] Failed to estimateGas, using default", a), I;
   }
 }
-function Q(t) {
+function z(r) {
   const {
-    inputToken: n,
+    inputToken: t,
     chainId: e,
     account: o
-  } = t;
-  return `${n.address.toLowerCase()}-${e}${o ? `-${o.toLowerCase()}` : ""}`;
+  } = r;
+  return `${t.address.toLowerCase()}-${e}${o ? `-${o.toLowerCase()}` : ""}`;
 }
-function N(t, n, e) {
-  return new O(t, n, e);
+function E(r, t, e) {
+  return new K(r, t, e);
 }
-class Y {
-  constructor(n, e) {
-    this.provider = n, this.walletSigner = e;
+class J {
+  constructor(t, e) {
+    this.provider = t, this.walletSigner = e;
   }
-  contractEncodeABI(n, e, o, a) {
-    return N(e || "", n, this.provider).interface.encodeFunctionData(o, a);
+  contractEncodeABI(t, e, o, n) {
+    return E(e || "", t, this.provider).interface.encodeFunctionData(o, 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, o) {
+    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 y.decode([n], e)[0];
+  decodeABIParameter(t, e) {
+    return v.decode([t], e)[0];
   }
-  decodeABIParameters(n, e) {
-    const o = y.decode(n, e);
+  decodeABIParameters(t, e) {
+    const o = v.decode(t, 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;
+      const n = {};
+      return Object.keys(o).forEach((a) => {
+        const c = o[a];
+        G.isBigNumber(c) ? n[a] = c.toHexString() : n[a] = c;
+      }), n;
     }
     return o;
   }
 }
-const C = /* @__PURE__ */ new Map(), b = /* @__PURE__ */ new Map();
-function z(t, n, e) {
-  const o = C.get(t);
+const D = /* @__PURE__ */ new Map(), A = /* @__PURE__ */ new Map();
+function X(r, t, e) {
+  const o = D.get(r);
   if (!e && o)
     return o;
-  const a = `${t}-${e}`, r = b.get(a);
-  if (r)
-    return r;
-  const i = new Y(n, e ? void 0 : w), c = new U(i);
-  return e ? (console.log(`[getPermitUtilsInstance] Set cached provider utils for chain ${t}-${e}`, c), b.set(a, c)) : (console.log(`[getPermitUtilsInstance] Set cached chain utils for chain ${t}`, c), C.set(t, c)), c;
+  const n = `${r}-${e}`, a = A.get(n);
+  if (a)
+    return a;
+  const c = new J(t, e ? void 0 : w), s = new x(c);
+  return e ? (console.log(`[getPermitUtilsInstance] Set cached provider utils for chain ${r}-${e}`, s), A.set(n, s)) : (console.log(`[getPermitUtilsInstance] Set cached chain utils for chain ${r}`, s), D.set(r, s)), s;
 }
-const J = [
+const U = [
   {
     constant: !0,
     inputs: [],
@@ -200,50 +199,120 @@ const J = [
     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 X(t, n, e) {
-  const o = x(t);
-  return N(o, J, e).callStatic.name();
+async function Z(r, t, e) {
+  const o = $(r), a = await E(o, U, e).callStatic.eip712Domain();
+  return ee(a, t, r);
+}
+async function ee(r, t, e) {
+  const {
+    extensions: o,
+    ...n
+  } = r;
+  if (o.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 ne(n);
+}
+const te = ["name", "version", "chainId", "verifyingContract", "salt"];
+function ne(r) {
+  const t = parseInt(r.fields, 16);
+  return te.reduce((e, o, n) => (t & 1 << n && (e[o] = r[o]), e), {});
 }
-const Z = {
-  value: S,
+async function re(r, t, e) {
+  const o = $(r);
+  return E(o, U, e).callStatic.name();
+}
+const oe = {
+  value: N,
   nonce: 0,
-  deadline: T()
-}, ee = {
+  deadline: k()
+}, ae = {
   allowed: !0,
   nonce: 0,
-  expiry: T()
-}, D = {}, g = {
+  expiry: k()
+}, _ = {}, g = {
   type: "unsupported"
 };
-async function fe(t) {
+async function Te(r) {
   const {
-    tokenAddress: n,
+    tokenAddress: t,
     chainId: e
-  } = t, o = `${e}-${n.toLowerCase()}`, a = D[o];
-  if (a)
-    return a;
-  const r = te(t);
-  return D[o] = r, r;
+  } = r, o = `${e}-${t.toLowerCase()}`, n = _[o];
+  if (n)
+    return n;
+  const a = ie(r);
+  return _[o] = a, a;
 }
-async function te(t) {
+async function ie(r) {
   const {
-    spender: n,
+    spender: t,
     tokenAddress: e,
-    tokenName: o,
-    chainId: a,
-    provider: r
-  } = t, i = z(a, r), c = w.address;
-  let l = o;
+    chainId: o,
+    provider: n
+  } = r, a = X(o, n), c = w.address;
+  let s;
+  try {
+    s = await Z(e, o, n);
+  } catch (i) {
+    console.debug(`[checkTokenIsPermittable] Couldn't fetch eip712domain for token ${e}`, i);
+  }
+  let l = s == null ? void 0 : s.name;
   try {
-    l = await X(e, a, r);
-  } catch (s) {
-    if (/ETIMEDOUT/.test(s) && !l)
+    l || (l = await re(e, o, 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 {
@@ -251,49 +320,49 @@ async function te(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), {
+    d = await a.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 (!B.has(e))
+  let u = s == null ? void 0 : s.version;
+  if (!W.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 a.getTokenVersion(e);
+    } catch (i) {
+      console.debug(`[checkTokenIsPermittable] Failed to get version for ${e} - ${l}`, i);
     }
   const m = {
-    chainId: a,
-    eip2612PermitUtils: i,
+    chainId: o,
+    eip2612PermitUtils: a,
     nonce: d,
-    spender: n,
+    spender: t,
     tokenAddress: e,
     tokenName: l,
     walletAddress: c,
     version: u
   };
   try {
-    return await _({
+    return await S({
       ...m,
       type: "eip-2612",
-      provider: r
+      provider: n
     });
-  } catch (s) {
+  } catch (i) {
     try {
-      return await re(e, i) ? await _({
+      return await ce(e, a) ? await S({
         ...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), {
+        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), {
@@ -302,81 +371,82 @@ async function te(t) {
     }
   }
 }
-async function _(t) {
+async function S(r) {
   const {
-    provider: n,
+    provider: t,
     chainId: e,
     walletAddress: o,
-    tokenAddress: a,
-    tokenName: r,
-    type: i,
-    version: c
-  } = t, d = await (i === "eip-2612" ? ne : oe)(t);
-  return d ? (await n.estimateGas({
+    tokenAddress: n,
+    tokenName: a,
+    type: c,
+    version: s
+  } = r, d = await (c === "eip-2612" ? se : le)(r);
+  return d ? (await t.estimateGas({
     data: d,
     from: o,
-    to: a
-  })).toNumber() > K[e] ? {
-    type: i,
-    version: c,
-    name: r
+    to: n
+  })).toNumber() > V[e] ? {
+    type: c,
+    version: s,
+    name: a
   } : {
     ...g,
-    name: r
+    name: a
   } : {
     ...g,
-    name: r
+    name: a
   };
 }
-async function ne(t) {
+async function se(r) {
   const {
-    eip2612PermitUtils: n,
+    eip2612PermitUtils: t,
     walletAddress: e,
     spender: o,
-    nonce: a,
-    chainId: r,
-    tokenName: i,
-    tokenAddress: c,
+    nonce: n,
+    chainId: a,
+    tokenName: c,
+    tokenAddress: s,
     version: l
-  } = t;
-  return L({
-    eip2162Utils: n,
+  } = r;
+  return R({
+    eip2162Utils: t,
     callDataParams: [{
-      ...Z,
+      ...oe,
       owner: e,
       spender: o,
-      nonce: a
-    }, +r, i, c, l]
+      nonce: n
+    }, +a, c, s, l]
   });
 }
-async function re(t, n) {
-  return await n.getPermitTypeHash(t) === A;
+async function ce(r, t) {
+  return await t.getPermitTypeHash(r) === L;
 }
-async function oe(t) {
+async function le(r) {
   const {
-    eip2612PermitUtils: n,
+    eip2612PermitUtils: t,
     tokenAddress: e,
     walletAddress: o,
-    spender: a,
-    nonce: r,
-    chainId: i,
-    tokenName: c,
+    spender: n,
+    nonce: a,
+    chainId: c,
+    tokenName: s,
     version: l
-  } = t;
-  return await n.getPermitTypeHash(e) === A ? $({
-    eip2162Utils: n,
+  } = r;
+  return await t.getPermitTypeHash(e) === L ? M({
+    eip2162Utils: t,
     callDataParams: [{
-      ...ee,
+      ...ae,
       holder: o,
-      spender: a,
-      nonce: r
-    }, i, c, e, l]
+      spender: n,
+      nonce: a
+    }, c, s, e, l]
   }) : !1;
 }
 export {
-  ue as checkIsCallDataAValidPermit,
-  pe as generatePermitHook,
-  z as getPermitUtilsInstance,
-  fe as getTokenPermitInfo,
-  q as isSupportedPermitInfo
+  w as PERMIT_SIGNER,
+  Ie as checkIsCallDataAValidPermit,
+  Pe as generatePermitHook,
+  X as getPermitUtilsInstance,
+  Te as getTokenPermitInfo,
+  j as isSupportedPermitInfo
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/permit-utils",
-  "version": "0.0.1",
+  "version": "0.1.1-RC.0",
   "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;