@lifi/sdk 3.6.0 → 3.6.2-beta.0

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/StatusManager.ts

@@ -40,12 +40,14 @@ export class StatusManager {
       step.execution = {
         status: 'PENDING',
         process: [],
+        startedAt: Date.now(),
       }
       this.updateStepInRoute(step)
     }
 
     // Change status to PENDING after resuming from FAILED
     if (step.execution.status === 'FAILED') {
+      step.execution.startedAt = Date.now()
       step.execution.status = 'PENDING'
       this.updateStepInRoute(step)
     }
@@ -69,6 +71,9 @@ export class StatusManager {
       throw Error("Can't update empty execution.")
     }
     step.execution.status = status
+    if (status === 'DONE') {
+      step.execution.doneAt = Date.now()
+    }
     if (execution) {
       step.execution = {
         ...step.execution,
@@ -162,9 +167,6 @@ export class StatusManager {
     }
 
     switch (status) {
-      case 'STARTED':
-        currentProcess.startedAt = Date.now()
-        break
       case 'CANCELLED':
         currentProcess.doneAt = Date.now()
         break

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/core/types.ts

@@ -162,6 +162,8 @@ export type Process = {
 }
 
 export interface Execution {
+  startedAt: number
+  doneAt?: number
   status: ExecutionStatus
   process: Array<Process>
   fromAmount?: string

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.0'
+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"}

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

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prettifyNativePermitData = exports.prettifyPermit2Data = void 0;
-const prettifyPermit2Data = (permitData) => {
-    return {
-        ...permitData,
-        values: {
-            ...permitData.values,
-            permitted: {
-                ...permitData.values.permitted,
-                amount: BigInt(permitData.values.permitted.amount),
-            },
-            nonce: BigInt(permitData.values.nonce),
-            deadline: BigInt(permitData.values.deadline),
-        },
-    };
-};
-exports.prettifyPermit2Data = prettifyPermit2Data;
-const prettifyNativePermitData = (permitData) => {
-    return {
-        ...permitData,
-        values: {
-            ...permitData.values,
-            value: BigInt(permitData.values.value),
-            nonce: BigInt(permitData.values.nonce),
-            deadline: BigInt(permitData.values.deadline),
-        },
-    };
-};
-exports.prettifyNativePermitData = prettifyNativePermitData;
-//# sourceMappingURL=utils.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../core/EVM/permits/utils.ts"],"names":[],"mappings":";;;AAUO,MAAM,mBAAmB,GAAG,CACjC,UAA+D,EACvC,EAAE;IAC1B,OAAO;QACL,GAAG,UAAU;QACb,MAAM,EAAE;YACN,GAAG,UAAU,CAAC,MAAM;YACpB,SAAS,EAAE;gBACT,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS;gBAC9B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC;aACnD;YACD,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC;YACtC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC;SAC7C;KACF,CAAA;AACH,CAAC,CAAA;AAfY,QAAA,mBAAmB,uBAe/B;AAEM,MAAM,wBAAwB,GAAG,CACtC,UAA4C,EAC1B,EAAE;IACpB,OAAO;QACL,GAAG,UAAU;QACb,MAAM,EAAE;YACN,GAAG,UAAU,CAAC,MAAM;YACpB,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC;YACtC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC;YACtC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC;SAC7C;KACF,CAAA;AACH,CAAC,CAAA;AAZY,QAAA,wBAAwB,4BAYpC"}

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

@@ -1,16 +0,0 @@
-import { signTypedData } from 'viem/actions';
-import { getAction } from 'viem/utils';
-export const signNativePermitMessage = async (client, permitData) => {
-    const signature = await getAction(client, signTypedData, 'signTypedData')({
-        account: client.account,
-        domain: permitData.domain,
-        types: permitData.types,
-        primaryType: 'Permit',
-        message: permitData.values,
-    });
-    return {
-        signature,
-        values: permitData.values,
-    };
-};
-//# sourceMappingURL=signNativePermitMessage.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"signNativePermitMessage.js","sourceRoot":"","sources":["../../../../core/EVM/permits/signNativePermitMessage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAGtC,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,MAAc,EACd,UAA4B,EACI,EAAE;IAClC,MAAM,SAAS,GAAG,MAAM,SAAS,CAC/B,MAAM,EACN,aAAa,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"}

package/src/_esm/core/EVM/permits/utils.js

@@ -1,26 +0,0 @@
-export const prettifyPermit2Data = (permitData) => {
-    return {
-        ...permitData,
-        values: {
-            ...permitData.values,
-            permitted: {
-                ...permitData.values.permitted,
-                amount: BigInt(permitData.values.permitted.amount),
-            },
-            nonce: BigInt(permitData.values.nonce),
-            deadline: BigInt(permitData.values.deadline),
-        },
-    };
-};
-export const prettifyNativePermitData = (permitData) => {
-    return {
-        ...permitData,
-        values: {
-            ...permitData.values,
-            value: BigInt(permitData.values.value),
-            nonce: BigInt(permitData.values.nonce),
-            deadline: BigInt(permitData.values.deadline),
-        },
-    };
-};
-//# sourceMappingURL=utils.js.map

package/src/_esm/core/EVM/permits/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../core/EVM/permits/utils.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,UAA+D,EACvC,EAAE;IAC1B,OAAO;QACL,GAAG,UAAU;QACb,MAAM,EAAE;YACN,GAAG,UAAU,CAAC,MAAM;YACpB,SAAS,EAAE;gBACT,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS;gBAC9B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC;aACnD;YACD,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC;YACtC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC;SAC7C;KACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,UAA4C,EAC1B,EAAE;IACpB,OAAO;QACL,GAAG,UAAU;QACb,MAAM,EAAE;YACN,GAAG,UAAU,CAAC,MAAM;YACpB,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC;YACtC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC;YACtC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC;SAC7C;KACF,CAAA;AACH,CAAC,CAAA"}

package/src/_types/core/EVM/permits/signNativePermitMessage.d.ts

@@ -1,4 +0,0 @@
-import type { Client } from 'viem';
-import type { NativePermitData, NativePermitSignature } from './types.js';
-export declare const signNativePermitMessage: (client: Client, permitData: NativePermitData) => Promise<NativePermitSignature>;
-//# sourceMappingURL=signNativePermitMessage.d.ts.map

package/src/_types/core/EVM/permits/signNativePermitMessage.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"signNativePermitMessage.d.ts","sourceRoot":"","sources":["../../../../core/EVM/permits/signNativePermitMessage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAGlC,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAEzE,eAAO,MAAM,uBAAuB,GAClC,QAAQ,MAAM,EACd,YAAY,gBAAgB,KAC3B,OAAO,CAAC,qBAAqB,CAiB/B,CAAA"}

package/src/_types/core/EVM/permits/utils.d.ts

@@ -1,6 +0,0 @@
-import type { PermitTransferFromData } from './signatureTransfer.js';
-import type { PermitData, PermitValues, PermitWitnessTransferFromValues } from '@lifi/types';
-import type { NativePermitData } from './types.js';
-export declare const prettifyPermit2Data: (permitData: PermitData<PermitWitnessTransferFromValues<string>>) => PermitTransferFromData;
-export declare const prettifyNativePermitData: (permitData: PermitData<PermitValues<string>>) => NativePermitData;
-//# sourceMappingURL=utils.d.ts.map

package/src/_types/core/EVM/permits/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../core/EVM/permits/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAEpE,OAAO,KAAK,EACV,UAAU,EACV,YAAY,EACZ,+BAA+B,EAChC,MAAM,aAAa,CAAA;AAEpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,eAAO,MAAM,mBAAmB,GAC9B,YAAY,UAAU,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC,KAC9D,sBAaF,CAAA;AAED,eAAO,MAAM,wBAAwB,GACnC,YAAY,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAC3C,gBAUF,CAAA"}

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

@@ -1,27 +0,0 @@
-import type {} from '@lifi/types'
-import type { Client } from 'viem'
-import { signTypedData } from 'viem/actions'
-import { getAction } from 'viem/utils'
-import type { NativePermitData, NativePermitSignature } from './types.js'
-
-export const signNativePermitMessage = async (
-  client: Client,
-  permitData: NativePermitData
-): Promise<NativePermitSignature> => {
-  const signature = await getAction(
-    client,
-    signTypedData,
-    'signTypedData'
-  )({
-    account: client.account!,
-    domain: permitData.domain,
-    types: permitData.types,
-    primaryType: 'Permit',
-    message: permitData.values,
-  })
-
-  return {
-    signature,
-    values: permitData.values,
-  }
-}

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

@@ -1,40 +0,0 @@
-import type { PermitTransferFromData } from './signatureTransfer.js'
-
-import type {
-  PermitData,
-  PermitValues,
-  PermitWitnessTransferFromValues,
-} from '@lifi/types'
-import type {} from './signatureTransfer.js'
-import type { NativePermitData } from './types.js'
-
-export const prettifyPermit2Data = (
-  permitData: PermitData<PermitWitnessTransferFromValues<string>>
-): PermitTransferFromData => {
-  return {
-    ...permitData,
-    values: {
-      ...permitData.values,
-      permitted: {
-        ...permitData.values.permitted,
-        amount: BigInt(permitData.values.permitted.amount),
-      },
-      nonce: BigInt(permitData.values.nonce),
-      deadline: BigInt(permitData.values.deadline),
-    },
-  }
-}
-
-export const prettifyNativePermitData = (
-  permitData: PermitData<PermitValues<string>>
-): NativePermitData => {
-  return {
-    ...permitData,
-    values: {
-      ...permitData.values,
-      value: BigInt(permitData.values.value),
-      nonce: BigInt(permitData.values.nonce),
-      deadline: BigInt(permitData.values.deadline),
-    },
-  }
-}