@lifi/sdk 3.7.9 → 3.7.10-beta.1

package/src/core/EVM/permits/getNativePermit.ts

@@ -9,33 +9,17 @@ import {
 import type { Address, Client, Hex } from 'viem'
 import type { TypedDataDomain } from 'viem'
 import { multicall, readContract } from 'viem/actions'
-import { eip2612Abi, eip2612Types } from '../abi.js'
+import { eip2612Abi } from '../abi.js'
 import { getActionWithFallback } from '../getActionWithFallback.js'
 import { getMulticallAddress } from '../utils.js'
+import {
+  DAI_LIKE_PERMIT_TYPEHASH,
+  EIP712_DOMAIN_TYPEHASH,
+  EIP712_DOMAIN_TYPEHASH_WITH_SALT,
+  eip2612Types,
+} from './constants.js'
 import type { NativePermitData } from './types.js'
 
-/**
- * EIP-712 domain typehash with chainId
- * @link https://eips.ethereum.org/EIPS/eip-712#specification
- *
- * keccak256(toBytes(
- *   'EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)'
- * ))
- */
-const EIP712_DOMAIN_TYPEHASH =
-  '0x8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f' as Hex
-
-/**
- * EIP-712 domain typehash with salt (e.g. USDC.e on Polygon)
- * @link https://eips.ethereum.org/EIPS/eip-712#specification
- *
- * keccak256(toBytes(
- *   'EIP712Domain(string name,string version,address verifyingContract,bytes32 salt)'
- * ))
- */
-const EIP712_DOMAIN_TYPEHASH_WITH_SALT =
-  '0x36c25de3e541d5d970f66e4210d728721220fff5c077cc6cd008b3a0c62adab7' as Hex
-
 export type GetNativePermitParams = {
   chainId: number
   tokenAddress: Address
@@ -142,18 +126,11 @@ function validateDomainSeparator({
   }
 }
 
-/**
- * Retrieves native permit data (EIP-2612) for a token on a specific chain
- * @link https://eips.ethereum.org/EIPS/eip-2612
- * @param client - The Viem client instance
- * @param chain - The extended chain object containing chain details
- * @param tokenAddress - The address of the token to check for permit support
- * @returns {Promise<NativePermitData>} Object containing permit data including name, version, nonce and support status
- */
-export const getNativePermit = async (
+export const getContractData = async (
   client: Client,
-  { chainId, tokenAddress, spenderAddress, amount }: GetNativePermitParams
-): Promise<NativePermitData | undefined> => {
+  chainId: number,
+  tokenAddress: Address
+) => {
   try {
     const multicallAddress = await getMulticallAddress(chainId)
 
@@ -168,6 +145,11 @@ export const getNativePermit = async (
         abi: eip2612Abi,
         functionName: 'DOMAIN_SEPARATOR',
       },
+      {
+        address: tokenAddress,
+        abi: eip2612Abi,
+        functionName: 'PERMIT_TYPEHASH',
+      },
       {
         address: tokenAddress,
         abi: eip2612Abi,
@@ -183,11 +165,16 @@ export const getNativePermit = async (
 
     if (multicallAddress) {
       try {
-        const [nameResult, domainSeparatorResult, noncesResult, versionResult] =
-          await getActionWithFallback(client, multicall, 'multicall', {
-            contracts: contractCalls,
-            multicallAddress,
-          })
+        const [
+          nameResult,
+          domainSeparatorResult,
+          permitTypehashResult,
+          noncesResult,
+          versionResult,
+        ] = await getActionWithFallback(client, multicall, 'multicall', {
+          contracts: contractCalls,
+          multicallAddress,
+        })
 
         if (
           nameResult.status !== 'success' ||
@@ -201,48 +188,35 @@ export const getNativePermit = async (
           throw new Error('Multicall failed')
         }
 
-        const { isValid, domain } = validateDomainSeparator({
+        return {
           name: nameResult.result,
-          version: versionResult.result ?? '1',
-          chainId,
-          verifyingContract: tokenAddress,
           domainSeparator: domainSeparatorResult.result,
-        })
-
-        if (!isValid) {
-          return undefined
-        }
-
-        const message = {
-          owner: client.account!.address,
-          spender: spenderAddress,
-          value: amount.toString(),
-          nonce: noncesResult.result.toString(),
-          deadline: BigInt(Math.floor(Date.now() / 1000) + 30 * 60).toString(), // 30 minutes
-        }
-
-        return {
-          primaryType: 'Permit',
-          domain,
-          types: eip2612Types,
-          message,
+          permitTypehash: permitTypehashResult.result,
+          nonce: noncesResult.result,
+          version: versionResult.result ?? '1',
         }
       } catch {
         // Fall through to individual calls
       }
     }
 
-    const [nameResult, domainSeparatorResult, noncesResult, versionResult] =
-      (await Promise.allSettled(
-        contractCalls.map((call) =>
-          getActionWithFallback(client, readContract, 'readContract', call)
-        )
-      )) as [
-        PromiseSettledResult<string>,
-        PromiseSettledResult<Hex>,
-        PromiseSettledResult<bigint>,
-        PromiseSettledResult<string>,
-      ]
+    const [
+      nameResult,
+      domainSeparatorResult,
+      permitTypehashResult,
+      noncesResult,
+      versionResult,
+    ] = (await Promise.allSettled(
+      contractCalls.map((call) =>
+        getActionWithFallback(client, readContract, 'readContract', call)
+      )
+    )) as [
+      PromiseSettledResult<string>,
+      PromiseSettledResult<Hex>,
+      PromiseSettledResult<Hex>,
+      PromiseSettledResult<bigint>,
+      PromiseSettledResult<string>,
+    ]
 
     if (
       nameResult.status !== 'fulfilled' ||
@@ -255,33 +229,71 @@ export const getNativePermit = async (
     const name = nameResult.value
     const version =
       versionResult.status === 'fulfilled' ? versionResult.value : '1'
-    const { isValid, domain } = validateDomainSeparator({
+
+    return {
       name,
-      version,
-      chainId,
-      verifyingContract: tokenAddress,
       domainSeparator: domainSeparatorResult.value,
-    })
-
-    if (!isValid) {
-      return undefined
+      permitTypehash:
+        permitTypehashResult.status === 'fulfilled'
+          ? permitTypehashResult.value
+          : undefined,
+      nonce: noncesResult.value,
+      version,
     }
+  } catch {
+    return undefined
+  }
+}
 
-    const message = {
-      owner: client.account!.address,
-      spender: spenderAddress,
-      value: amount.toString(),
-      nonce: noncesResult.value.toString(),
-      deadline: BigInt(Math.floor(Date.now() / 1000) + 30 * 60).toString(), // 30 minutes
-    }
+/**
+ * Retrieves native permit data (EIP-2612) for a token on a specific chain
+ * @link https://eips.ethereum.org/EIPS/eip-2612
+ * @param client - The Viem client instance
+ * @param chain - The extended chain object containing chain details
+ * @param tokenAddress - The address of the token to check for permit support
+ * @returns {Promise<NativePermitData>} Object containing permit data including name, version, nonce and support status
+ */
+export const getNativePermit = async (
+  client: Client,
+  { chainId, tokenAddress, spenderAddress, amount }: GetNativePermitParams
+): Promise<NativePermitData | undefined> => {
+  const contractData = await getContractData(client, chainId, tokenAddress)
+  if (!contractData) {
+    return undefined
+  }
+  const { name, domainSeparator, permitTypehash, nonce, version } = contractData
 
-    return {
-      primaryType: 'Permit',
-      domain,
-      types: eip2612Types,
-      message,
-    }
-  } catch {
+  // We don't support DAI-like permits yet (e.g. DAI on Ethereum)
+  if (permitTypehash === DAI_LIKE_PERMIT_TYPEHASH) {
+    return undefined
+  }
+
+  const { isValid, domain } = validateDomainSeparator({
+    name,
+    version,
+    chainId,
+    verifyingContract: tokenAddress,
+    domainSeparator,
+  })
+
+  if (!isValid) {
     return undefined
   }
+
+  const deadline = BigInt(Math.floor(Date.now() / 1000) + 30 * 60).toString() // 30 minutes
+
+  const message = {
+    owner: client.account!.address,
+    spender: spenderAddress,
+    value: amount.toString(),
+    nonce: nonce.toString(),
+    deadline,
+  }
+
+  return {
+    primaryType: 'Permit',
+    domain,
+    types: eip2612Types,
+    message,
+  }
 }

package/src/version.ts

@@ -1,2 +1,2 @@
 export const name = '@lifi/sdk'
-export const version = '3.7.9'
+export const version = '3.7.10-beta.1'