@lifi/sdk 3.6.1 → 3.6.2-beta.0

package/src/core/EVM/checkAllowance.ts

@@ -1,17 +1,14 @@
-import type { ExtendedChain, LiFiStep } from '@lifi/types'
+import type { ExtendedChain, LiFiStep, SignedTypedData } from '@lifi/types'
 import type { Address, Client, Hash } from 'viem'
+import { signTypedData } from 'viem/actions'
+import { getAction } from 'viem/utils'
 import { MaxUint256 } from '../../constants.js'
 import type { StatusManager } from '../StatusManager.js'
 import type { ExecutionOptions, Process, ProcessType } from '../types.js'
 import { getAllowance } from './getAllowance.js'
 import { parseEVMErrors } from './parseEVMErrors.js'
 import { getNativePermit } from './permits/getNativePermit.js'
-import { signNativePermitMessage } from './permits/signNativePermitMessage.js'
-import type {
-  NativePermitData,
-  NativePermitSignature,
-} from './permits/types.js'
-import { prettifyNativePermitData } from './permits/utils.js'
+import type { NativePermitData } from './permits/types.js'
 import { setAllowance } from './setAllowance.js'
 import { isRelayerStep } from './typeguards.js'
 import type { Call } from './types.js'
@@ -38,7 +35,7 @@ export type AllowanceResult =
     }
   | {
       status: 'NATIVE_PERMIT'
-      data: NativePermitSignature
+      data: SignedTypedData
     }
 
 export const checkAllowance = async ({
@@ -78,6 +75,7 @@ export const checkAllowance = async ({
     const spenderAddress = permit2Supported
       ? chain.permit2
       : step.estimate.approvalAddress
+
     const fromAmount = BigInt(step.action.fromAmount)
 
     const approved = await getAllowance(
@@ -97,17 +95,15 @@ export const checkAllowance = async ({
 
     let nativePermitData: NativePermitData | undefined
     if (isRelayerTransaction) {
-      const permitData = step.permits.find(
-        (p) => p.permitType === 'Permit'
-      )?.permitData
-      if (permitData) {
-        nativePermitData = prettifyNativePermitData(permitData)
-      }
+      nativePermitData = step.typedData.find(
+        (p) => p.primaryType === 'Permit'
+      ) as NativePermitData
     } else {
       nativePermitData = await getNativePermit(
         client,
-        chain,
+        chain.id,
         step.action.fromToken.address as Address,
+        chain.permit2Proxy as Address,
         fromAmount
       )
     }
@@ -123,12 +119,25 @@ export const checkAllowance = async ({
       !!nativePermitData && !!chain.permit2Proxy && !batchingSupported
 
     if (nativePermitSupported && nativePermitData) {
-      const nativePermitSignature = await signNativePermitMessage(
+      const signature = await getAction(
         client,
-        nativePermitData
-      )
+        signTypedData,
+        'signTypedData'
+      )({
+        account: client.account!,
+        domain: nativePermitData.domain,
+        types: nativePermitData.types,
+        primaryType: 'Permit',
+        message: nativePermitData.message,
+      })
       statusManager.updateProcess(step, allowanceProcess.type, 'DONE')
-      return { status: 'NATIVE_PERMIT', data: nativePermitSignature }
+      return {
+        status: 'NATIVE_PERMIT',
+        data: {
+          ...nativePermitData,
+          signature,
+        },
+      }
     }
 
     // Set new allowance

package/src/core/EVM/checkPermitSupport.ts

@@ -49,10 +49,22 @@ export const checkPermitSupport = async ({
   let nativePermit: NativePermitData | undefined
   // Try with wallet client first, fallback to public client
   try {
-    nativePermit = await getNativePermit(client, chain, tokenAddress, amount)
+    nativePermit = await getNativePermit(
+      client,
+      chain.id,
+      tokenAddress,
+      chain.permit2Proxy as Address,
+      amount
+    )
   } catch {
     client = await getPublicClient(chain.id)
-    nativePermit = await getNativePermit(client, chain, tokenAddress, amount)
+    nativePermit = await getNativePermit(
+      client,
+      chain.id,
+      tokenAddress,
+      chain.permit2Proxy as Address,
+      amount
+    )
   }
 
   let permit2Allowance: bigint | undefined

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

@@ -35,13 +35,13 @@ export interface PermitBatch {
 export type PermitSingleData = {
   domain: TypedDataDomain
   types: TypedData
-  values: PermitSingle
+  message: PermitSingle
 }
 
 export type PermitBatchData = {
   domain: TypedDataDomain
   types: TypedData
-  values: PermitBatch
+  message: PermitBatch
 }
 
 const PERMIT_DETAILS = [
@@ -85,7 +85,7 @@ export function getPermitSingleData(
 
   return {
     domain,
-    values: permit,
+    message: permit,
   }
 }
 
@@ -101,7 +101,7 @@ export function getPermitBatchData(
 
   return {
     domain,
-    values: permit,
+    message: permit,
   }
 }
 
@@ -118,14 +118,14 @@ export function getPermitData(
     return {
       domain,
       types: PERMIT_TYPES,
-      values: permit,
+      message: permit,
     }
   }
   permit.details.forEach(validatePermitDetails)
   return {
     domain,
     types: PERMIT_BATCH_TYPES,
-    values: permit,
+    message: permit,
   }
 }
 
@@ -135,7 +135,7 @@ export function hash(
   chainId: number
 ): string {
   if (isPermit(permit)) {
-    const { domain, values } = getPermitSingleData(
+    const { domain, message } = getPermitSingleData(
       permit,
       permit2Address,
       chainId
@@ -145,16 +145,20 @@ export function hash(
       domain,
       types: PERMIT_TYPES,
       primaryType: 'PermitSingle',
-      message: values,
+      message: message,
     })
   }
-  const { domain, values } = getPermitBatchData(permit, permit2Address, chainId)
+  const { domain, message } = getPermitBatchData(
+    permit,
+    permit2Address,
+    chainId
+  )
 
   return hashTypedData({
     domain,
     types: PERMIT_BATCH_TYPES,
     primaryType: 'PermitBatch',
-    message: values,
+    message: message,
   })
 }
 

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

@@ -1,4 +1,3 @@
-import type { ExtendedChain } from '@lifi/types'
 import {
   encodeAbiParameters,
   keccak256,
@@ -145,12 +144,13 @@ function validateDomainSeparator({
  */
 export const getNativePermit = async (
   client: Client,
-  chain: ExtendedChain,
+  chainId: number,
   tokenAddress: Address,
+  spenderAddress: Address,
   amount: bigint
 ): Promise<NativePermitData | undefined> => {
   try {
-    const multicallAddress = await getMulticallAddress(chain.id)
+    const multicallAddress = await getMulticallAddress(chainId)
 
     const contractCalls = [
       {
@@ -197,7 +197,7 @@ export const getNativePermit = async (
       const { isValid, domain } = validateDomainSeparator({
         name: nameResult.result,
         version: versionResult.result ?? '1',
-        chainId: BigInt(chain.id),
+        chainId: BigInt(chainId),
         verifyingContract: tokenAddress,
         domainSeparator: domainSeparatorResult.result,
       })
@@ -206,18 +206,19 @@ export const getNativePermit = async (
         return undefined
       }
 
-      const values = {
+      const message = {
         owner: client.account!.address,
-        spender: chain.permit2Proxy as Address,
+        spender: spenderAddress,
         value: amount,
         nonce: noncesResult.result,
         deadline: BigInt(Math.floor(Date.now() / 1000) + 30 * 60), // 30 minutes
       }
 
       return {
+        primaryType: 'Permit',
         domain,
         types: eip2612Types,
-        values,
+        message,
       }
     }
 
@@ -245,7 +246,7 @@ export const getNativePermit = async (
     const { isValid, domain } = validateDomainSeparator({
       name,
       version,
-      chainId: BigInt(chain.id),
+      chainId: BigInt(chainId),
       verifyingContract: tokenAddress,
       domainSeparator: domainSeparatorResult.value,
     })
@@ -254,18 +255,19 @@ export const getNativePermit = async (
       return undefined
     }
 
-    const values = {
+    const message = {
       owner: client.account!.address,
-      spender: chain.permit2Proxy as Address,
+      spender: spenderAddress,
       value: amount,
       nonce: noncesResult.value,
       deadline: BigInt(Math.floor(Date.now() / 1000) + 30 * 60), // 30 minutes
     }
 
     return {
+      primaryType: 'Permit',
       domain,
       types: eip2612Types,
-      values,
+      message,
     }
   } catch {
     return undefined

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

@@ -1,17 +1,10 @@
-import type { ExtendedChain } from '@lifi/types'
+import type { ExtendedChain, SignedTypedData } from '@lifi/types'
 import type { Address, Client, Hex } from 'viem'
 import { keccak256 } from 'viem'
 import { signTypedData } from 'viem/actions'
 import { getAction } from 'viem/utils'
 import { getPermitTransferFromValues } from './getPermitTransferFromValues.js'
-import {
-  type PermitBatchTransferFrom,
-  type PermitBatchTransferFromData,
-  type PermitTransferFrom,
-  type PermitTransferFromData,
-  getPermitData,
-} from './signatureTransfer.js'
-import type { Permit2Signature } from './types.js'
+import { getPermitData } from './signatureTransfer.js'
 
 export interface SignPermit2MessageParams {
   client: Client
@@ -22,59 +15,45 @@ export interface SignPermit2MessageParams {
   witness?: boolean
 }
 
-export interface SignPermit2SingleParams extends SignPermit2MessageParams {
-  permitData?: PermitTransferFromData
-}
-
-export interface SignPermit2BatchParams extends SignPermit2MessageParams {
-  permitData?: PermitBatchTransferFromData
-}
-
-export function signPermit2Message(
-  params: SignPermit2SingleParams
-): Promise<Permit2Signature<PermitTransferFrom>>
-export function signPermit2Message(
-  params: SignPermit2BatchParams
-): Promise<Permit2Signature<PermitBatchTransferFrom>>
 export async function signPermit2Message(
-  params: SignPermit2SingleParams | SignPermit2BatchParams
-): Promise<Permit2Signature<PermitTransferFrom | PermitBatchTransferFrom>> {
-  const { client, chain, tokenAddress, amount, data, permitData, witness } =
-    params
+  params: SignPermit2MessageParams
+): Promise<SignedTypedData> {
+  const { client, chain, tokenAddress, amount, data, witness } = params
 
-  let _permitData = permitData
-  if (!_permitData) {
-    const permitTransferFrom = await getPermitTransferFromValues(
-      client,
-      chain,
-      tokenAddress,
-      amount
-    )
+  const permitTransferFrom = await getPermitTransferFromValues(
+    client,
+    chain,
+    tokenAddress,
+    amount
+  )
 
-    // Create witness data for the LI.FI call
-    const _witness = witness
-      ? {
-          witness: {
-            diamondAddress: chain.diamondAddress as Address,
-            diamondCalldataHash: keccak256(data),
-          },
-          witnessTypeName: 'LiFiCall',
-          witnessType: {
-            LiFiCall: [
-              { name: 'diamondAddress', type: 'address' },
-              { name: 'diamondCalldataHash', type: 'bytes32' },
-            ],
-          },
-        }
-      : undefined
+  // Create witness data for the LI.FI call
+  const _witness = witness
+    ? {
+        witness: {
+          diamondAddress: chain.diamondAddress as Address,
+          diamondCalldataHash: keccak256(data),
+        },
+        witnessTypeName: 'LiFiCall',
+        witnessType: {
+          LiFiCall: [
+            { name: 'diamondAddress', type: 'address' },
+            { name: 'diamondCalldataHash', type: 'bytes32' },
+          ],
+        },
+      }
+    : undefined
 
-    _permitData = getPermitData(
-      permitTransferFrom,
-      chain.permit2 as Address,
-      chain.id,
-      _witness
-    )
-  }
+  const permitData = getPermitData(
+    permitTransferFrom,
+    chain.permit2 as Address,
+    chain.id,
+    _witness
+  )
+
+  const primaryType = witness
+    ? 'PermitWitnessTransferFrom'
+    : 'PermitTransferFrom'
 
   const signature = await getAction(
     client,
@@ -82,14 +61,15 @@ export async function signPermit2Message(
     'signTypedData'
   )({
     account: client.account!,
-    primaryType: witness ? 'PermitWitnessTransferFrom' : 'PermitTransferFrom',
-    domain: _permitData.domain,
-    types: _permitData.types,
-    message: _permitData.values,
+    primaryType,
+    domain: permitData.domain,
+    types: permitData.types,
+    message: permitData.message,
   })
 
   return {
+    ...permitData,
+    primaryType,
     signature,
-    values: _permitData.values,
   }
 }

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

@@ -36,13 +36,13 @@ export type PermitBatchTransferFrom = {
 export type PermitTransferFromData = {
   domain: TypedDataDomain
   types: TypedData
-  values: PermitTransferFrom
+  message: PermitTransferFrom
 }
 
 export type PermitBatchTransferFromData = {
   domain: TypedDataDomain
   types: TypedData
-  values: PermitBatchTransferFrom
+  message: PermitBatchTransferFrom
 }
 
 const TOKEN_PERMISSIONS = [
@@ -103,14 +103,14 @@ export function getPermitTransferData(
       } as const)
     : PERMIT_TRANSFER_FROM_TYPES
 
-  const values = witness
+  const message = witness
     ? Object.assign(permit, { witness: witness.witness })
     : permit
 
   return {
     domain,
     types,
-    values,
+    message,
   }
 }
 
@@ -141,14 +141,14 @@ export function getPermitBatchTransferData(
       }
     : PERMIT_BATCH_TRANSFER_FROM_TYPES
 
-  const values = witness
+  const message = witness
     ? Object.assign(permit, { witness: witness.witness })
     : permit
 
   return {
     domain,
     types,
-    values,
+    message,
   }
 }
 
@@ -185,7 +185,7 @@ export function hash<T extends PermitTransferFrom | PermitBatchTransferFrom>(
   witness?: Witness
 ) {
   if (isPermitTransferFrom(permit)) {
-    const { domain, types, values } = getPermitTransferData(
+    const { domain, types, message } = getPermitTransferData(
       permit,
       permit2Address,
       chainId,
@@ -197,11 +197,11 @@ export function hash<T extends PermitTransferFrom | PermitBatchTransferFrom>(
       types,
       primaryType: witness ? 'PermitWitnessTransferFrom' : 'PermitTransferFrom',
       message: {
-        ...values,
+        ...message,
       },
     })
   }
-  const { domain, types, values } = getPermitBatchTransferData(
+  const { domain, types, message } = getPermitBatchTransferData(
     permit,
     permit2Address,
     chainId,
@@ -214,7 +214,7 @@ export function hash<T extends PermitTransferFrom | PermitBatchTransferFrom>(
     primaryType: witness
       ? 'PermitBatchWitnessTransferFrom'
       : 'PermitBatchTransferFrom',
-    message: { ...values },
+    message: { ...message },
   })
 }
 

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

@@ -1,14 +1,10 @@
 import type { Address, Hash, TypedData, TypedDataDomain } from 'viem'
-import type {
-  PermitBatchTransferFrom,
-  PermitTransferFrom,
-} from './signatureTransfer.js'
 
 export type PermitSignature = {
   signature: Hash
 }
 
-export type NativePermitValues = {
+export type NativePermitMessage = {
   owner: Address
   spender: Address
   nonce: bigint
@@ -17,17 +13,8 @@ export type NativePermitValues = {
 }
 
 export type NativePermitData = {
+  primaryType: 'Permit'
   domain: TypedDataDomain
   types: TypedData
-  values: NativePermitValues
-}
-
-export type NativePermitSignature = PermitSignature & {
-  values: NativePermitValues
-}
-
-export type Permit2Signature<
-  T extends PermitTransferFrom | PermitBatchTransferFrom,
-> = PermitSignature & {
-  values: T
+  message: NativePermitMessage
 }

package/src/core/EVM/typeguards.ts

@@ -1,10 +1,20 @@
 import type { LiFiStep } from '@lifi/types'
 import type { LiFiStepExtended } from '../types.js'
-import type { EVMPermitStep } from './types.js'
+
+type RelayerStep = (LiFiStepExtended | LiFiStep) & {
+  typedData: NonNullable<(LiFiStepExtended | LiFiStep)['typedData']>
+}
 
 export function isRelayerStep(
   step: LiFiStepExtended | LiFiStep
-): step is EVMPermitStep {
-  const evmStep = step as EVMPermitStep
-  return 'permits' in evmStep && evmStep.permits?.length > 0
+): step is RelayerStep {
+  return !!step.typedData && step.typedData.length > 0
+}
+
+export function isGaslessStep(
+  step: LiFiStepExtended | LiFiStep
+): step is RelayerStep {
+  return !!step.typedData?.find(
+    (p) => p.primaryType === 'PermitWitnessTransferFrom'
+  )
 }

package/src/core/EVM/types.ts

@@ -1,6 +1,6 @@
-import { type BaseToken, ChainType, type Permit } from '@lifi/types'
+import { type BaseToken, ChainType } from '@lifi/types'
 import type { Address, Client, FallbackTransportConfig, Hex } from 'viem'
-import type { LiFiStepExtended, SwitchChainHook } from '../types.js'
+import type { SwitchChainHook } from '../types.js'
 import type { SDKProvider } from '../types.js'
 
 export interface EVMProviderOptions {
@@ -52,10 +52,6 @@ export interface RevokeApprovalRequest {
   spenderAddress: string
 }
 
-export interface EVMPermitStep extends LiFiStepExtended {
-  permits: Permit[]
-}
-
 export type Call = {
   to: Address
   data?: Hex

package/src/core/prepareRestart.ts

@@ -4,9 +4,21 @@ export const prepareRestart = async (route: RouteExtended) => {
   for (let index = 0; index < route.steps.length; index++) {
     const step = route.steps[index]
     if (step.execution) {
-      step.execution.process = step.execution.process.filter(
-        (process) => process.status === 'DONE' && process.txHash
+      // Find the index of the last process that has tx hash
+      const lastValidIndex = step.execution.process.findLastIndex(
+        (process) => !!process.txHash
       )
+
+      // Keep all processes up to the one with tx hash
+      if (lastValidIndex >= 0) {
+        step.execution.process = step.execution.process.slice(
+          0,
+          lastValidIndex + 1
+        )
+      } else {
+        // If no tx hash exists, reset the process array
+        step.execution.process = []
+      }
     }
     step.transactionRequest = undefined
   }

package/src/index.ts

@@ -14,7 +14,7 @@ export {
 export { isEVM } from './core/EVM/types.js'
 export { isBatchingSupported } from './core/EVM/isBatchingSupported.js'
 export { isExtendedChain, convertExtendedChain } from './core/EVM/utils.js'
-export { isRelayerStep } from './core/EVM/typeguards.js'
+export { isRelayerStep, isGaslessStep } from './core/EVM/typeguards.js'
 export type {
   EVMProvider,
   EVMProviderOptions,

package/src/services/api.ts

@@ -19,7 +19,6 @@ import {
   type RelayStatusResponse,
   type RelayStatusResponseData,
   type RelayerQuoteResponse,
-  type RelayerQuoteResponseData,
   type RequestOptions,
   type RoutesRequest,
   type RoutesResponse,
@@ -262,7 +261,7 @@ export const getStatus = async (
 export const getRelayerQuote = async (
   params: QuoteRequest,
   options?: RequestOptions
-): Promise<RelayerQuoteResponseData> => {
+): Promise<LiFiStep> => {
   const requiredParameters: Array<keyof QuoteRequest> = [
     'fromChain',
     'fromToken',
@@ -332,10 +331,8 @@ export const relayTransaction = async (
   options?: RequestOptions
 ): Promise<RelayResponseData> => {
   const requiredParameters: Array<keyof RelayRequest> = [
-    'tokenOwner',
-    'chainId',
-    'permits',
-    'callData',
+    'typedData',
+    'transactionRequest',
   ]
 
   for (const requiredParameter of requiredParameters) {

package/src/version.ts

@@ -1,2 +1,2 @@
 export const name = '@lifi/sdk'
-export const version = '3.6.1'
+export const version = '3.6.2-beta.0'

package/src/_cjs/core/EVM/permits/signNativePermitMessage.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.signNativePermitMessage = void 0;
-const actions_1 = require("viem/actions");
-const utils_1 = require("viem/utils");
-const signNativePermitMessage = async (client, permitData) => {
-    const signature = await (0, utils_1.getAction)(client, actions_1.signTypedData, 'signTypedData')({
-        account: client.account,
-        domain: permitData.domain,
-        types: permitData.types,
-        primaryType: 'Permit',
-        message: permitData.values,
-    });
-    return {
-        signature,
-        values: permitData.values,
-    };
-};
-exports.signNativePermitMessage = signNativePermitMessage;
-//# sourceMappingURL=signNativePermitMessage.js.map

package/src/_cjs/core/EVM/permits/signNativePermitMessage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"signNativePermitMessage.js","sourceRoot":"","sources":["../../../../core/EVM/permits/signNativePermitMessage.ts"],"names":[],"mappings":";;;AAEA,0CAA4C;AAC5C,sCAAsC;AAG/B,MAAM,uBAAuB,GAAG,KAAK,EAC1C,MAAc,EACd,UAA4B,EACI,EAAE;IAClC,MAAM,SAAS,GAAG,MAAM,IAAA,iBAAS,EAC/B,MAAM,EACN,uBAAa,EACb,eAAe,CAChB,CAAC;QACA,OAAO,EAAE,MAAM,CAAC,OAAQ;QACxB,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,WAAW,EAAE,QAAQ;QACrB,OAAO,EAAE,UAAU,CAAC,MAAM;KAC3B,CAAC,CAAA;IAEF,OAAO;QACL,SAAS;QACT,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAA;AACH,CAAC,CAAA;AApBY,QAAA,uBAAuB,2BAoBnC"}