@cowprotocol/permit-utils 0.3.1 → 0.6.1-RC.0

package/README.md

@@ -43,7 +43,7 @@ const hookData = await generatePermitHook({
   spender,
   provider,
   permitInfo,
-  eip2162Utils,
+  eip2612Utils,
   account,
   nonce
 })
@@ -57,7 +57,7 @@ import { checkIsCallDataAValidPermit } from "@cowprotocol/permit-utils"
 const isCallDataAValidPermit = await checkIsCallDataAValidPermit(
   account,
   chainId,
-  eip2612Utils, 
+  eip2612Utils,
   tokenAddress,
   tokenName,
   callData,
@@ -97,7 +97,7 @@ if (!permitInfo) {
 const eip2612Utils = getPermitUtilsInstance(chainId, provider, account)
 
 // Need to know what the current permit nonce is
-const nonce = await eip2162Utils.getTokenNonce(inputToken.address, account)
+const nonce = await eip2612Utils.getTokenNonce(inputToken.address, account)
 
 // Calling this fn should trigger the signature in the user's wallet
 const hookData = await generatePermitHook({

package/index.cjs

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

package/index.js

@@ -1,12 +1,12 @@
 import { MaxUint256 as H } from "@ethersproject/constants";
 import { Wallet as F } from "@ethersproject/wallet";
-import { EIP_2612_PERMIT_SELECTOR as w, DAI_PERMIT_SELECTOR as I, Eip2612PermitUtils as x, DAI_LIKE_PERMIT_TYPEHASH as _ } from "@1inch/permit-signed-approvals-utils";
-import { defaultAbiCoder as T } from "@ethersproject/abi";
-import { BigNumber as O } from "@ethersproject/bignumber";
+import { EIP_2612_PERMIT_SELECTOR as w, DAI_PERMIT_SELECTOR as I, Eip2612PermitUtils as O, DAI_LIKE_PERMIT_TYPEHASH as _ } from "@1inch/permit-signed-approvals-utils";
+import { defaultAbiCoder as b } from "@ethersproject/abi";
+import { BigNumber as x } from "@ethersproject/bignumber";
 import { Contract as G } from "@ethersproject/contracts";
 import { getAddress as L } from "@ethersproject/address";
-const B = "0x68012a4467ce455b6b278b1a6815db9b7224deaa6bced68c3848ec21e6380f8a", k = new F(B), V = 55e3, h = "80000", $ = H.toString(), K = 157788e6;
-async function ye(n, t, e, a, r, o, {
+const B = "0x68012a4467ce455b6b278b1a6815db9b7224deaa6bced68c3848ec21e6380f8a", T = new F(B), V = 55e3, h = "80000", $ = H.toString(), K = 157788e6;
+async function he(n, t, e, a, r, o, {
   version: i,
   type: l,
   name: d
@@ -42,37 +42,37 @@ async function ye(n, t, e, a, r, o, {
     }
 }
 async function S({
-  eip2162Utils: n,
+  eip2612Utils: n,
   callDataParams: t
 }) {
   const [e, a, r, ...o] = t;
   return (await n.buildPermitCallData(e, a, r, ...o)).replace("0x", w);
 }
 async function N({
-  eip2162Utils: n,
+  eip2612Utils: n,
   callDataParams: t
 }) {
   return (await n.buildDaiLikePermitCallData(...t)).replace("0x", I);
 }
-function b() {
+function k() {
   return Math.ceil((Date.now() + K) / 1e3);
 }
 function q(n) {
   return !!n && n.type !== "unsupported";
 }
-const P = {};
-async function he(n) {
-  const t = Q(n), e = P[t];
+const W = "1db4bacb661a90fb6b475fd5b585acba9745bc373573c65ecc3e8f5bfd5dee1f", P = {};
+async function Pe(n) {
+  const t = Y(n), e = P[t];
   if (e)
     return await e;
-  const a = W(n).catch((r) => {
+  const a = j(n).catch((r) => {
     console.debug("[generatePermitHook] cached request failed", r);
   }).finally(() => {
     delete P[t];
   });
   return P[t] = a, a;
 }
-async function W(n) {
+async function j(n) {
   const {
     inputToken: t,
     spender: e,
@@ -80,15 +80,15 @@ async function W(n) {
     permitInfo: r,
     provider: o,
     account: i,
-    eip2162Utils: l,
+    eip2612Utils: l,
     nonce: d
   } = n, s = t.address, m = r.name || t.name;
   if (!q(r))
     throw new Error(`Trying to generate permit hook for unsupported token: ${s}`);
   if (!m)
     throw new Error(`No token name for token: ${s}`);
-  const u = i || k.address, p = d === void 0 ? await l.getTokenNonce(s, u) : d, c = b(), f = $, E = r.type === "eip-2612" ? await S({
-    eip2162Utils: l,
+  const u = i || T.address, p = d === void 0 ? await l.getTokenNonce(s, u) : d, c = k(), f = $, E = r.type === "eip-2612" ? await S({
+    eip2612Utils: l,
     callDataParams: [{
       owner: u,
       spender: e,
@@ -97,7 +97,7 @@ async function W(n) {
       deadline: c
     }, a, m, s, r.version]
   }) : await N({
-    eip2162Utils: l,
+    eip2612Utils: l,
     callDataParams: [{
       holder: u,
       spender: e,
@@ -106,14 +106,15 @@ async function W(n) {
       nonce: p,
       expiry: c
     }, a, m, s, r.version]
-  }), U = await j(E, u, s, o, !!i);
+  }), U = await Q(E, u, s, o, !!i);
   return {
     target: s,
     callData: E,
-    gasLimit: U
+    gasLimit: U,
+    dappId: W
   };
 }
-async function j(n, t, e, a, r) {
+async function Q(n, t, e, a, r) {
   try {
     const o = await a.estimateGas({
       data: n,
@@ -125,7 +126,7 @@ async function j(n, t, e, a, r) {
     return console.debug("[calculatePermitGasLimit] Failed to estimateGas, using default", o), h;
   }
 }
-function Q(n) {
+function Y(n) {
   const {
     inputToken: t,
     chainId: e,
@@ -136,7 +137,7 @@ function Q(n) {
 function y(n, t, e) {
   return new G(n, t, e);
 }
-class Y {
+class z {
   constructor(t, e) {
     this.provider = t, this.walletSigner = e;
   }
@@ -154,29 +155,29 @@ class Y {
     });
   }
   decodeABIParameter(t, e) {
-    return T.decode([t], e)[0];
+    return b.decode([t], e)[0];
   }
   decodeABIParameters(t, e) {
-    const a = T.decode(t, e);
+    const a = b.decode(t, e);
     if (a && typeof a == "object") {
       const r = {};
       return Object.keys(a).forEach((o) => {
         const i = a[o];
-        O.isBigNumber(i) ? r[o] = i.toHexString() : r[o] = i;
+        x.isBigNumber(i) ? r[o] = i.toHexString() : r[o] = i;
       }), r;
     }
     return a;
   }
 }
 const C = /* @__PURE__ */ new Map(), v = /* @__PURE__ */ new Map();
-function z(n, t, e) {
+function J(n, t, e) {
   const a = C.get(n);
   if (!e && a)
     return a;
   const r = `${n}-${e}`, o = v.get(r);
   if (o)
     return o;
-  const i = new Y(t, e ? void 0 : k), l = new x(i);
+  const i = new z(t, e ? void 0 : T), l = new O(i);
   return e ? (console.log(`[getPermitUtilsInstance] Set cached provider utils for chain ${n}-${e}`, l), v.set(r, l)) : (console.log(`[getPermitUtilsInstance] Set cached chain utils for chain ${n}`, l), C.set(n, l)), l;
 }
 const R = [
@@ -238,11 +239,11 @@ const R = [
     type: "function"
   }
 ];
-async function J(n, t, e) {
+async function X(n, t, e) {
   const a = L(n), o = await y(a, R, e).callStatic.eip712Domain();
-  return X(o, t, n);
+  return Z(o, t, n);
 }
-async function X(n, t, e) {
+async function Z(n, t, e) {
   const {
     extensions: a,
     ...r
@@ -253,18 +254,18 @@ async function X(n, t, e) {
     throw Error(`ChainId mismatch. Received: '${r.chainId}', expected: '${t}'`);
   if (r.verifyingContract && e.toLowerCase() !== r.verifyingContract.toLowerCase())
     throw Error(`Address mismatch. Received: '${r.verifyingContract}', expected: '${e}'`);
-  return ee(r);
+  return te(r);
 }
-const Z = ["name", "version", "chainId", "verifyingContract", "salt"];
-function ee(n) {
+const ee = ["name", "version", "chainId", "verifyingContract", "salt"];
+function te(n) {
   const t = parseInt(n.fields, 16);
-  return Z.reduce((e, a, r) => (t & 1 << r && (e[a] = n[a]), e), {});
+  return ee.reduce((e, a, r) => (t & 1 << r && (e[a] = n[a]), e), {});
 }
-async function te(n, t, e) {
+async function ne(n, t, e) {
   const a = L(n);
   return y(a, R, e).callStatic.name();
 }
-const ne = [[{
+const re = [[{
   constant: !0,
   inputs: [],
   name: "version",
@@ -288,7 +289,7 @@ const ne = [[{
   type: "function"
 }]];
 async function M(n, t, e = 0) {
-  const a = ne[e];
+  const a = re[e];
   if (!a)
     return "1";
   try {
@@ -296,49 +297,49 @@ async function M(n, t, e = 0) {
       to: n,
       data: o
     });
-    return i === "0x" || Number.isNaN(Number(i)) ? "1" : i.startsWith("0x") ? T.decode(["string"], i).toString() : i;
+    return i === "0x" || Number.isNaN(Number(i)) ? "1" : i.startsWith("0x") ? b.decode(["string"], i).toString() : i;
   } catch {
     return M(n, t, e + 1);
   }
 }
-const re = {
+const ae = {
   value: $,
   nonce: 0,
-  deadline: b()
-}, ae = {
+  deadline: k()
+}, oe = {
   allowed: !0,
   nonce: 0,
-  expiry: b()
+  expiry: k()
 }, D = {}, g = {
   type: "unsupported"
 };
-async function Pe(n) {
+async function we(n) {
   const {
     tokenAddress: t,
     chainId: e
   } = n, a = `${e}-${t.toLowerCase()}`, r = D[a];
   if (r)
     return r;
-  const o = oe(n);
+  const o = ie(n);
   return D[a] = o, o;
 }
-async function oe(n) {
+async function ie(n) {
   const {
     spender: t,
     tokenAddress: e,
     chainId: a,
     provider: r,
     minGasLimit: o
-  } = n, i = z(a, r), l = k.address;
+  } = n, i = J(a, r), l = T.address;
   let d;
   try {
-    d = await J(e, a, r);
+    d = await X(e, a, r);
   } catch {
     console.debug(`[checkTokenIsPermittable] Couldn't fetch eip712domain for token ${e}`);
   }
   let s = d == null ? void 0 : d.name;
   try {
-    s || (s = await te(e, a, r));
+    s || (s = await ne(e, a, r));
   } catch (c) {
     if (/ETIMEDOUT/.test(c) && !s)
       return {
@@ -387,7 +388,7 @@ async function oe(n) {
     });
   } catch (c) {
     try {
-      return await se(e, i) ? await A({
+      return await ce(e, i) ? await A({
         ...p,
         type: "dai-like",
         provider: r
@@ -413,7 +414,7 @@ async function A(n) {
     type: o,
     version: i,
     minGasLimit: l = V
-  } = n, s = await (o === "eip-2612" ? ie : ce)(n);
+  } = n, s = await (o === "eip-2612" ? se : le)(n);
   return s ? (await t.estimateGas({
     data: s,
     from: e,
@@ -430,7 +431,7 @@ async function A(n) {
     name: r
   };
 }
-async function ie(n) {
+async function se(n) {
   const {
     eip2612PermitUtils: t,
     walletAddress: e,
@@ -442,19 +443,19 @@ async function ie(n) {
     version: d
   } = n;
   return S({
-    eip2162Utils: t,
+    eip2612Utils: t,
     callDataParams: [{
-      ...re,
+      ...ae,
       owner: e,
       spender: a,
       nonce: r
     }, +o, i, l, d]
   });
 }
-async function se(n, t) {
+async function ce(n, t) {
   return await t.getPermitTypeHash(n) === _;
 }
-async function ce(n) {
+async function le(n) {
   const {
     eip2612PermitUtils: t,
     tokenAddress: e,
@@ -466,9 +467,9 @@ async function ce(n) {
     version: d
   } = n;
   return await t.getPermitTypeHash(e) === _ ? N({
-    eip2162Utils: t,
+    eip2612Utils: t,
     callDataParams: [{
-      ...ae,
+      ...oe,
       holder: a,
       spender: r,
       nonce: o
@@ -477,10 +478,10 @@ async function ce(n) {
 }
 export {
   V as DEFAULT_MIN_GAS_LIMIT,
-  k as PERMIT_SIGNER,
-  ye as checkIsCallDataAValidPermit,
-  he as generatePermitHook,
-  z as getPermitUtilsInstance,
-  Pe as getTokenPermitInfo,
+  T as PERMIT_SIGNER,
+  he as checkIsCallDataAValidPermit,
+  Pe as generatePermitHook,
+  J as getPermitUtilsInstance,
+  we as getTokenPermitInfo,
   q as isSupportedPermitInfo
 };

package/lib/checkIsCallDataAValidPermit.d.ts

@@ -1,3 +1,3 @@
 import { Eip2612PermitUtils } from '@1inch/permit-signed-approvals-utils';
 import { PermitInfo } from '../types';
-export declare function checkIsCallDataAValidPermit(owner: string, chainId: number, eip2162Utils: Eip2612PermitUtils, tokenAddress: string, _tokenName: string | undefined, callData: string, { version, type, name }: PermitInfo): Promise<boolean | undefined>;
+export declare function checkIsCallDataAValidPermit(owner: string, chainId: number, eip2612Utils: Eip2612PermitUtils, tokenAddress: string, _tokenName: string | undefined, callData: string, { version, type, name }: PermitInfo): Promise<boolean | undefined>;

package/package.json

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

package/types.d.ts

@@ -17,7 +17,7 @@ export type PermitHookParams = {
     chainId: number;
     permitInfo: PermitInfo;
     provider: JsonRpcProvider;
-    eip2162Utils: Eip2612PermitUtils;
+    eip2612Utils: Eip2612PermitUtils;
     account?: string | undefined;
     nonce?: number | undefined;
 };
@@ -27,9 +27,9 @@ type FailedToIdentify = {
 };
 export type GetTokenPermitIntoResult = PermitInfo | FailedToIdentify;
 type BasePermitCallDataParams = {
-    eip2162Utils: Eip2612PermitUtils;
+    eip2612Utils: Eip2612PermitUtils;
 };
-export type BuildEip2162PermitCallDataParams = BasePermitCallDataParams & {
+export type BuildEip2612PermitCallDataParams = BasePermitCallDataParams & {
     callDataParams: Parameters<Eip2612PermitUtils['buildPermitCallData']>;
 };
 export type BuildDaiLikePermitCallDataParams = BasePermitCallDataParams & {

package/utils/buildPermitCallData.d.ts

@@ -1,3 +1,3 @@
-import { BuildDaiLikePermitCallDataParams, BuildEip2162PermitCallDataParams } from '../types';
-export declare function buildEip2162PermitCallData({ eip2162Utils, callDataParams, }: BuildEip2162PermitCallDataParams): Promise<string>;
-export declare function buildDaiLikePermitCallData({ eip2162Utils, callDataParams, }: BuildDaiLikePermitCallDataParams): Promise<string>;
+import { BuildDaiLikePermitCallDataParams, BuildEip2612PermitCallDataParams } from '../types';
+export declare function buildEip2612PermitCallData({ eip2612Utils, callDataParams, }: BuildEip2612PermitCallDataParams): Promise<string>;
+export declare function buildDaiLikePermitCallData({ eip2612Utils, callDataParams, }: BuildDaiLikePermitCallDataParams): Promise<string>;