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

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 DEFAULT_MIN_GAS_LIMIT = 55000;
 export declare const DEFAULT_PERMIT_GAS_LIMIT = "80000";
 export declare const DEFAULT_PERMIT_VALUE: string;
 export declare const DEFAULT_PERMIT_DURATION: number;

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

package/index.d.ts

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

package/index.js

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

package/package.json

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

package/types.d.ts

@@ -40,5 +40,6 @@ export type GetTokenPermitInfoParams = {
     tokenAddress: string;
     chainId: number;
     provider: JsonRpcProvider;
+    minGasLimit?: number | undefined;
 };
 export {};