@cowprotocol/permit-utils 0.1.1-RC.0 → 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 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;
+"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,18 +1,17 @@
-import { SupportedChainId as f } from "@cowprotocol/cow-sdk";
-import { MaxUint256 as O } from "@ethersproject/constants";
+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 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 { 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 $ } 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, {
+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
@@ -21,135 +20,135 @@ async function Ie(r, t, e, o, n, a, {
   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: t,
     tokenName: d,
-    tokenAddress: o,
-    callData: a,
+    tokenAddress: a,
+    callData: o,
     version: c
   };
   let m;
-  if (a.startsWith(P) ? 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: a.replace(P, "0x")
-  }) : a.startsWith(T) && (m = e.recoverDaiLikePermitOwnerFromCallData({
+    callData: o.replace(P, "0x")
+  }) : o.startsWith(I) && (m = e.recoverDaiLikePermitOwnerFromCallData({
     ...u,
-    callData: a.replace(T, "0x")
+    callData: o.replace(I, "0x")
   })), !!m)
     try {
       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;
+      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, o, n, ...a] = t;
-  return (await r.buildPermitCallData(e, o, n, ...a)).replace("0x", P);
+  const [e, a, n, ...o] = t;
+  return (await r.buildPermitCallData(e, a, n, ...o)).replace("0x", P);
 }
-async function M({
+async function N({
   eip2162Utils: r,
   callDataParams: t
 }) {
-  return (await r.buildDaiLikePermitCallData(...t)).replace("0x", T);
+  return (await r.buildDaiLikePermitCallData(...t)).replace("0x", I);
 }
-function k() {
-  return Math.ceil((Date.now() + q) / 1e3);
+function w() {
+  return Math.ceil((Date.now() + V) / 1e3);
 }
-function j(r) {
+function W(r) {
   return !!r && r.type !== "unsupported";
 }
-const h = {};
-async function Pe(r) {
-  const t = z(r), e = h[t];
+const f = {};
+async function ye(r) {
+  const t = Y(r), e = f[t];
   if (e)
     try {
       return await e;
     } catch (n) {
-      console.debug("[generatePermitHookWith] cached request failed", n), delete h[t];
+      console.debug("[generatePermitHookWith] cached request failed", n), delete f[t];
     }
-  const o = Q(r).then((n) => (delete h[t], n));
-  return h[t] = o, o;
+  const a = j(r).then((n) => (delete f[t], n));
+  return f[t] = a, a;
 }
-async function Q(r) {
+async function j(r) {
   const {
     inputToken: t,
     spender: e,
-    chainId: o,
+    chainId: a,
     permitInfo: n,
-    provider: a,
+    provider: o,
     account: c,
     eip2162Utils: s,
     nonce: l
   } = r, d = t.address, u = n.name || t.name;
-  if (!j(n))
+  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 = c || w.address, i = l === void 0 ? await s.getTokenNonce(d, m) : l, p = k(), C = N, b = n.type === "eip-2612" ? await R({
+  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: C,
+      value: E,
       nonce: i,
       deadline: p
-    }, o, u, d, n.version]
-  }) : await M({
+    }, a, u, d, n.version]
+  }) : await N({
     eip2162Utils: s,
     callDataParams: [{
       holder: m,
       spender: e,
       allowed: !0,
-      value: C,
+      value: E,
       nonce: i,
       expiry: p
-    }, o, u, d, n.version]
-  }), H = await Y(b, m, d, a, !!c);
+    }, a, u, d, n.version]
+  }), U = await Q(C, m, d, o, !!c);
   return {
     target: d,
-    callData: b,
-    gasLimit: H
+    callData: C,
+    gasLimit: U
   };
 }
-async function Y(r, t, e, o, n) {
+async function Q(r, t, e, a, n) {
   try {
-    const a = await o.estimateGas({
+    const o = await a.estimateGas({
       data: r,
       from: t,
       to: e
-    }), 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;
+    }), 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 z(r) {
+function Y(r) {
   const {
     inputToken: t,
     chainId: e,
-    account: o
+    account: a
   } = r;
-  return `${t.address.toLowerCase()}-${e}${o ? `-${o.toLowerCase()}` : ""}`;
+  return `${t.address.toLowerCase()}-${e}${a ? `-${a.toLowerCase()}` : ""}`;
 }
-function E(r, t, e) {
-  return new K(r, t, e);
+function k(r, t, e) {
+  return new G(r, t, e);
 }
-class J {
+class z {
   constructor(t, e) {
     this.provider = t, this.walletSigner = e;
   }
-  contractEncodeABI(t, e, o, n) {
-    return E(e || "", t, this.provider).interface.encodeFunctionData(o, n);
+  contractEncodeABI(t, e, a, n) {
+    return k(e || "", t, this.provider).interface.encodeFunctionData(a, n);
   }
-  signTypedData(t, e, o) {
+  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);
   }
@@ -160,32 +159,32 @@ class J {
     });
   }
   decodeABIParameter(t, e) {
-    return v.decode([t], e)[0];
+    return b.decode([t], e)[0];
   }
   decodeABIParameters(t, e) {
-    const o = v.decode(t, e);
-    if (o && typeof o == "object") {
+    const a = b.decode(t, e);
+    if (a && typeof a == "object") {
       const n = {};
-      return Object.keys(o).forEach((a) => {
-        const c = o[a];
-        G.isBigNumber(c) ? n[a] = c.toHexString() : n[a] = c;
+      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 D = /* @__PURE__ */ new Map(), A = /* @__PURE__ */ new Map();
-function X(r, t, e) {
-  const o = D.get(r);
-  if (!e && o)
-    return o;
-  const n = `${r}-${e}`, a = A.get(n);
-  if (a)
+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 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 n = `${r}-${e}`, o = D.get(n);
+  if (o)
+    return o;
+  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 U = [
+const M = [
   {
     constant: !0,
     inputs: [],
@@ -244,69 +243,69 @@ const U = [
     type: "function"
   }
 ];
-async function Z(r, t, e) {
-  const o = $(r), a = await E(o, U, e).callStatic.eip712Domain();
-  return ee(a, t, r);
+async function X(r, t, e) {
+  const a = $(r), o = await k(a, M, e).callStatic.eip712Domain();
+  return Z(o, t, r);
 }
-async function ee(r, t, e) {
+async function Z(r, t, e) {
   const {
-    extensions: o,
+    extensions: a,
     ...n
   } = r;
-  if (o.length > 0)
+  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 ne(n);
+  return te(n);
 }
-const te = ["name", "version", "chainId", "verifyingContract", "salt"];
-function ne(r) {
+const ee = ["name", "version", "chainId", "verifyingContract", "salt"];
+function te(r) {
   const t = parseInt(r.fields, 16);
-  return te.reduce((e, o, n) => (t & 1 << n && (e[o] = r[o]), e), {});
+  return ee.reduce((e, a, n) => (t & 1 << n && (e[a] = r[a]), e), {});
 }
-async function re(r, t, e) {
-  const o = $(r);
-  return E(o, U, e).callStatic.name();
+async function ne(r, t, e) {
+  const a = $(r);
+  return k(a, M, e).callStatic.name();
 }
-const oe = {
-  value: N,
+const re = {
+  value: S,
   nonce: 0,
-  deadline: k()
+  deadline: w()
 }, ae = {
   allowed: !0,
   nonce: 0,
-  expiry: k()
-}, _ = {}, g = {
+  expiry: w()
+}, A = {}, g = {
   type: "unsupported"
 };
-async function Te(r) {
+async function Pe(r) {
   const {
     tokenAddress: t,
     chainId: e
-  } = r, o = `${e}-${t.toLowerCase()}`, n = _[o];
+  } = r, a = `${e}-${t.toLowerCase()}`, n = A[a];
   if (n)
     return n;
-  const a = ie(r);
-  return _[o] = a, a;
+  const o = oe(r);
+  return A[a] = o, o;
 }
-async function ie(r) {
+async function oe(r) {
   const {
     spender: t,
     tokenAddress: e,
-    chainId: o,
+    chainId: a,
     provider: n
-  } = r, a = X(o, n), c = w.address;
+  } = r, o = J(a, n), c = T.address;
   let s;
   try {
-    s = await Z(e, o, n);
+    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 re(e, o, n));
+    l || (l = await ne(e, a, n));
   } catch (i) {
     if (/ETIMEDOUT/.test(i) && !l)
       return {
@@ -320,7 +319,7 @@ async function ie(r) {
     };
   let d;
   try {
-    d = await a.getTokenNonce(e, c);
+    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,
@@ -330,15 +329,15 @@ async function ie(r) {
     });
   }
   let u = s == null ? void 0 : s.version;
-  if (!W.has(e) && u === void 0)
+  if (!q.has(e) && u === void 0)
     try {
-      u = await a.getTokenVersion(e);
+      u = await o.getTokenVersion(e);
     } catch (i) {
       console.debug(`[checkTokenIsPermittable] Failed to get version for ${e} - ${l}`, i);
     }
   const m = {
-    chainId: o,
-    eip2612PermitUtils: a,
+    chainId: a,
+    eip2612PermitUtils: o,
     nonce: d,
     spender: t,
     tokenAddress: e,
@@ -347,14 +346,14 @@ async function ie(r) {
     version: u
   };
   try {
-    return await S({
+    return await _({
       ...m,
       type: "eip-2612",
       provider: n
     });
   } catch (i) {
     try {
-      return await ce(e, a) ? await S({
+      return await se(e, o) ? await _({
         ...m,
         type: "dai-like",
         provider: n
@@ -371,39 +370,39 @@ async function ie(r) {
     }
   }
 }
-async function S(r) {
+async function _(r) {
   const {
     provider: t,
     chainId: e,
-    walletAddress: o,
+    walletAddress: a,
     tokenAddress: n,
-    tokenName: a,
+    tokenName: o,
     type: c,
     version: s
-  } = r, d = await (c === "eip-2612" ? se : le)(r);
+  } = r, d = await (c === "eip-2612" ? ie : ce)(r);
   return d ? (await t.estimateGas({
     data: d,
-    from: o,
+    from: a,
     to: n
-  })).toNumber() > V[e] ? {
+  })).toNumber() > B[e] ? {
     type: c,
     version: s,
-    name: a
+    name: o
   } : {
     ...g,
-    name: a
+    name: o
   } : {
     ...g,
-    name: a
+    name: o
   };
 }
-async function se(r) {
+async function ie(r) {
   const {
     eip2612PermitUtils: t,
     walletAddress: e,
-    spender: o,
+    spender: a,
     nonce: n,
-    chainId: a,
+    chainId: o,
     tokenName: c,
     tokenAddress: s,
     version: l
@@ -411,42 +410,42 @@ async function se(r) {
   return R({
     eip2162Utils: t,
     callDataParams: [{
-      ...oe,
+      ...re,
       owner: e,
-      spender: o,
+      spender: a,
       nonce: n
-    }, +a, c, s, l]
+    }, +o, c, s, l]
   });
 }
-async function ce(r, t) {
+async function se(r, t) {
   return await t.getPermitTypeHash(r) === L;
 }
-async function le(r) {
+async function ce(r) {
   const {
     eip2612PermitUtils: t,
     tokenAddress: e,
-    walletAddress: o,
+    walletAddress: a,
     spender: n,
-    nonce: a,
+    nonce: o,
     chainId: c,
     tokenName: s,
     version: l
   } = r;
-  return await t.getPermitTypeHash(e) === L ? M({
+  return await t.getPermitTypeHash(e) === L ? N({
     eip2162Utils: t,
     callDataParams: [{
       ...ae,
-      holder: o,
+      holder: a,
       spender: n,
-      nonce: a
+      nonce: o
     }, c, s, e, l]
   }) : !1;
 }
 export {
-  w as PERMIT_SIGNER,
-  Ie as checkIsCallDataAValidPermit,
-  Pe as generatePermitHook,
-  X as getPermitUtilsInstance,
-  Te as getTokenPermitInfo,
-  j as isSupportedPermitInfo
+  T as PERMIT_SIGNER,
+  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.1.1-RC.0",
+  "version": "0.1.1-RC.1",
   "type": "module",
   "dependencies": {
     "ethers": "^5.7.2",