@lifi/sdk 4.0.0-alpha.8 → 4.0.0-beta.0

package/src/core/StatusManager.ts

@@ -1,27 +1,23 @@
 import type { ChainId, LiFiStep } from '@lifi/types'
 import type {
   Execution,
-  ExecutionStatus,
+  ExecutionAction,
+  ExecutionActionStatus,
+  ExecutionActionType,
   LiFiStepExtended,
-  Process,
-  ProcessStatus,
-  ProcessType,
 } from '../types/core.js'
+import { getActionMessage } from './actionMessages.js'
 import { executionState } from './executionState.js'
-import { getProcessMessage } from './processMessages.js'
 
-type FindOrCreateProcessProps = {
+type ActionProps = {
   step: LiFiStepExtended
-  type: ProcessType
-  chainId?: ChainId
-  status?: ProcessStatus
-  startedAt?: number
+  type: ExecutionActionType
+  chainId: ChainId
+  status: ExecutionActionStatus
 }
 
 /**
- * Manages status updates of a route and provides various functions for tracking processes
- * @param {string} routeId The route dd this StatusManger belongs to.
- * @returns {StatusManager} An instance of StatusManager.
+ * Manages status updates of a route and provides various functions for tracking actions.
  */
 export class StatusManager {
   private readonly routeId: string
@@ -33,15 +29,15 @@ export class StatusManager {
 
   /**
    * Initializes the execution object of a Step.
-   * @param step  The current step in execution
-   * @returns The initialized execution object for this step and a function to update this step
+   * @param step The current step in execution
+   * @returns The initialized execution object for this step
    */
-  initExecutionObject = (step: LiFiStepExtended): Execution => {
+  initializeExecution = (step: LiFiStepExtended): Execution => {
     if (!step.execution) {
       step.execution = {
-        status: 'PENDING',
-        process: [],
         startedAt: Date.now(),
+        status: 'PENDING',
+        actions: [],
       }
       this.updateStepInRoute(step)
     }
@@ -50,6 +46,9 @@ export class StatusManager {
     if (step.execution.status === 'FAILED') {
       step.execution.startedAt = Date.now()
       step.execution.status = 'PENDING'
+      step.execution.signedAt = undefined
+      step.execution.lastActionType = undefined
+      step.execution.error = undefined
       this.updateStepInRoute(step)
     }
 
@@ -58,170 +57,166 @@ export class StatusManager {
 
   /**
    * Updates the execution object of a Step.
-   * @param step  The current step in execution
-   * @param status  The status for the execution
-   * @param execution Optional. Information about received tokens
+   * @param step The current step in execution
+   * @param execution Partial execution data to merge
    * @returns The step with the updated execution object
    */
   updateExecution(
     step: LiFiStepExtended,
-    status: ExecutionStatus,
-    execution?: Partial<Execution>
+    execution: Partial<Execution>
   ): LiFiStep {
     if (!step.execution) {
       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,
-        ...execution,
-      }
+    step.execution = {
+      ...step.execution,
+      ...execution,
     }
     this.updateStepInRoute(step)
     return step
   }
 
   /**
-   * Finds a process of the specified type in the step's execution
+   * Finds an action of the specified type in the step's execution
    * @param step The step to search in
-   * @param type The process type to find
-   * @param status Optional status to update the process with if found
-   * @returns The found process or undefined if not found
+   * @param type The action type to find
+   * @returns The found action or undefined if not found
    */
-  findProcess(
+  findAction(
     step: LiFiStepExtended,
-    type: ProcessType,
-    status?: ProcessStatus
-  ): Process | undefined {
-    if (!step.execution?.process) {
+    type: ExecutionActionType
+  ): ExecutionAction | undefined {
+    if (!step.execution?.actions) {
       throw new Error("Execution hasn't been initialized.")
     }
 
-    const process = step.execution.process.find((p) => p.type === type)
-
-    if (process && status && process.status !== status) {
-      process.status = status
-      this.updateStepInRoute(step)
-    }
+    const action = step.execution.actions.find((p) => p.type === type)
 
-    return process
+    return action
   }
 
   /**
-   * Create and push a new process into the execution.
-   * @param step The step that should contain the new process.
-   * @param type Type of the process. Used to identify already existing processes.
-   * @param chainId Chain Id of the process.
-   * @param status By default created process is set to the STARTED status. We can override new process with the needed status.
-   * @returns Returns process.
+   * Create and push a new action into the execution.
+   * Caller is responsible for ensuring an action of this type does not already exist.
+   * @param step The step that should contain the new action.
+   * @param type Type of the action.
+   * @param chainId Chain Id of the action.
+   * @param status The initial status for the new action.
+   * @returns The created action.
    */
-  findOrCreateProcess = ({
+  createAction = ({
     step,
     type,
     chainId,
     status,
-    startedAt,
-  }: FindOrCreateProcessProps): Process => {
-    const process = this.findProcess(step, type, status)
-
-    if (process) {
-      return process
+  }: ActionProps): ExecutionAction => {
+    if (!step.execution) {
+      throw new Error("Execution hasn't been initialized.")
     }
 
-    const newProcess: Process = {
-      type: type,
-      startedAt: startedAt ?? Date.now(),
-      message: getProcessMessage(type, status ?? 'STARTED'),
-      status: status ?? 'STARTED',
-      chainId: chainId,
+    const newAction: ExecutionAction = {
+      type,
+      message: getActionMessage(type, status),
+      status,
+      chainId,
     }
 
-    step.execution!.process.push(newProcess)
+    step.execution.actions.push(newAction)
+    step.execution.lastActionType = type
     this.updateStepInRoute(step)
-    return newProcess
+    return newAction
+  }
+
+  /**
+   * Find an existing action by type and update it, or create a new one if none exists.
+   * @param step The step that should contain the action.
+   * @param type Type of the action. Used to identify already existing actions.
+   * @param chainId Chain Id of the action (used when creating).
+   * @param status The status to set on the found or newly created action.
+   * @returns The updated or newly created action.
+   */
+  initializeAction = ({
+    step,
+    type,
+    chainId,
+    status,
+  }: ActionProps): ExecutionAction => {
+    const action = this.findAction(step, type)
+
+    if (action) {
+      return this.updateAction(step, type, status, {
+        error: undefined,
+      })
+    }
+
+    return this.createAction({ step, type, chainId, status })
   }
 
   /**
-   * Update a process object.
-   * @param step The step where the process should be updated
-   * @param type  The process type to update
-   * @param status The status the process gets.
-   * @param [params] Additional parameters to append to the process.
-   * @returns The update process
+   * Update an action object.
+   * @param step The step where the action should be updated
+   * @param type  The action type to update
+   * @param status The status the action gets.
+   * @param [params] Additional parameters to append to the action.
+   * @returns The updated action
    */
-  updateProcess = (
+  updateAction = (
     step: LiFiStepExtended,
-    type: ProcessType,
-    status: ProcessStatus,
-    params?: Partial<Process>
-  ): Process => {
+    type: ExecutionActionType,
+    status: ExecutionActionStatus,
+    params?: Partial<ExecutionAction & { signedAt?: number }>
+  ): ExecutionAction => {
     if (!step.execution) {
       throw new Error("Can't update an empty step execution.")
     }
-    const currentProcess = this.findProcess(step, type)
+    const currentAction = this.findAction(step, type)
 
-    if (!currentProcess) {
-      throw new Error("Can't find a process for the given type.")
+    if (!currentAction) {
+      throw new Error("Can't find an action for the given type.")
     }
 
     switch (status) {
       case 'CANCELLED':
-        currentProcess.doneAt = Date.now()
         break
       case 'FAILED':
-        currentProcess.doneAt = Date.now()
         step.execution.status = 'FAILED'
+        if (params?.error) {
+          step.execution.error = params.error
+        }
         break
       case 'DONE':
-        currentProcess.doneAt = Date.now()
         break
       case 'PENDING':
         step.execution.status = 'PENDING'
-        currentProcess.pendingAt = Date.now()
+        if (params?.signedAt) {
+          step.execution.signedAt = params.signedAt
+        }
         break
       case 'RESET_REQUIRED':
       case 'MESSAGE_REQUIRED':
       case 'ACTION_REQUIRED':
         step.execution.status = 'ACTION_REQUIRED'
-        currentProcess.actionRequiredAt = Date.now()
         break
       default:
         break
     }
 
-    currentProcess.status = status
-    currentProcess.message = getProcessMessage(type, status)
-    // set extra parameters or overwritte the standard params set in the switch statement
+    step.execution.lastActionType = type
+
+    currentAction.status = status
+    currentAction.message = getActionMessage(type, status)
+    // set extra parameters or overwrite the standard params set in the switch statement
     if (params) {
-      for (const [key, value] of Object.entries(params)) {
-        currentProcess[key] = value
-      }
+      const { signedAt: _signedAt, ...rest } = params
+      Object.assign(currentAction, rest)
     }
-    // Sort processes, the ones with DONE status go first
-    step.execution.process = [
-      ...step.execution.process.filter((process) => process.status === 'DONE'),
-      ...step.execution.process.filter((process) => process.status !== 'DONE'),
+    // Sort actions, the ones with DONE status go first
+    step.execution.actions = [
+      ...step.execution.actions.filter((action) => action.status === 'DONE'),
+      ...step.execution.actions.filter((action) => action.status !== 'DONE'),
     ]
     this.updateStepInRoute(step) // updates the step in the route
-    return currentProcess
-  }
-
-  /**
-   * Remove a process from the execution
-   * @param step The step where the process should be removed from
-   * @param type  The process type to remove
-   */
-  removeProcess = (step: LiFiStepExtended, type: ProcessType): void => {
-    if (!step.execution) {
-      throw new Error("Execution hasn't been initialized.")
-    }
-    const index = step.execution.process.findIndex((p) => p.type === type)
-    step.execution.process.splice(index, 1)
-    this.updateStepInRoute(step)
+    return currentAction
   }
 
   updateStepInRoute = (step: LiFiStep): LiFiStep => {

package/src/core/TaskPipeline.ts

@@ -0,0 +1,28 @@
+import type { StepExecutorContext, TaskResult } from '../types/execution.js'
+import type { BaseStepExecutionTask } from './BaseStepExecutionTask.js'
+
+export class TaskPipeline {
+  private readonly tasks: BaseStepExecutionTask[]
+
+  constructor(tasks: BaseStepExecutionTask[]) {
+    this.tasks = tasks
+  }
+
+  async run(context: StepExecutorContext): Promise<TaskResult> {
+    for (const task of this.tasks) {
+      const shouldRun = await task.shouldRun(context)
+      if (!shouldRun) {
+        continue
+      }
+      const result = await task.run(context)
+      if (result.status === 'PAUSED') {
+        return { status: 'PAUSED' }
+      }
+      if (result.context && typeof result.context === 'object') {
+        Object.assign(context, result.context)
+      }
+    }
+
+    return { status: 'COMPLETED' }
+  }
+}

package/src/core/{processMessages.ts → actionMessages.ts}

@@ -1,15 +1,27 @@
 import type { StatusMessage, Substatus } from '@lifi/types'
-import type { ProcessStatus, ProcessType } from '../types/core.js'
+import type {
+  ExecutionActionStatus,
+  ExecutionActionType,
+} from '../types/core.js'
 
-const processMessages: Record<
-  ProcessType,
-  Partial<Record<ProcessStatus, string>>
+const actionMessages: Record<
+  ExecutionActionType,
+  Partial<Record<ExecutionActionStatus, string>>
 > = {
-  TOKEN_ALLOWANCE: {
+  CHECK_ALLOWANCE: {
+    STARTED: 'Checking token allowance',
+    PENDING: 'Waiting for token allowance check',
+    DONE: 'Token allowance checked',
+  },
+  RESET_ALLOWANCE: {
+    STARTED: 'Resetting token allowance',
+    RESET_REQUIRED: 'Resetting token allowance',
+    PENDING: 'Waiting for token allowance reset',
+    DONE: 'Token allowance reset',
+  },
+  SET_ALLOWANCE: {
     STARTED: 'Setting token allowance',
     ACTION_REQUIRED: 'Set token allowance',
-    RESET_REQUIRED: 'Resetting token allowance',
-    MESSAGE_REQUIRED: 'Sign token allowance message',
     PENDING: 'Waiting for token allowance',
     DONE: 'Token allowance set',
   },
@@ -28,6 +40,7 @@ const processMessages: Record<
     DONE: 'Bridge transaction confirmed',
   },
   RECEIVING_CHAIN: {
+    STARTED: 'Waiting for destination chain',
     PENDING: 'Waiting for destination chain',
     DONE: 'Bridge completed',
   },
@@ -37,7 +50,14 @@ const processMessages: Record<
     PENDING: 'Waiting for permit message',
     DONE: 'Permit message signed',
   },
+  NATIVE_PERMIT: {
+    STARTED: 'Preparing transaction',
+    ACTION_REQUIRED: 'Sign permit message',
+    PENDING: 'Waiting for permit message',
+    DONE: 'Permit message signed',
+  },
 }
+
 const substatusMessages: Record<
   StatusMessage,
   Partial<Record<Substatus, string>>
@@ -63,12 +83,12 @@ const substatusMessages: Record<
   NOT_FOUND: {},
 }
 
-export function getProcessMessage(
-  type: ProcessType,
-  status: ProcessStatus
+export function getActionMessage(
+  type: ExecutionActionType,
+  status: ExecutionActionStatus
 ): string | undefined {
-  const processMessage = processMessages[type][status]
-  return processMessage
+  const actionMessage = actionMessages[type][status]
+  return actionMessage
 }
 
 export function getSubstatusMessage(

package/src/core/execution.ts

@@ -1,8 +1,9 @@
 import type { Route } from '@lifi/types'
 import { LiFiErrorCode } from '../errors/constants.js'
-import { ProviderError } from '../errors/errors.js'
+import { ExecuteStepRetryError, ProviderError } from '../errors/errors.js'
 import type {
   ExecutionOptions,
+  LiFiStepExtended,
   RouteExtended,
   SDKClient,
   SDKProvider,
@@ -94,7 +95,6 @@ const executeSteps = async (
     const step = route.steps[index]
     const previousStep = route.steps[index - 1]
     // Check if the step is already done
-    //
     if (step.execution?.status === 'DONE') {
       continue
     }
@@ -136,7 +136,21 @@ const executeSteps = async (
         updateRouteExecution(route, execution.executionOptions)
       }
 
-      const executedStep = await stepExecutor.executeStep(client, step)
+      let executedStep: LiFiStepExtended
+      try {
+        executedStep = await stepExecutor.executeStep(client, step)
+      } catch (e) {
+        if (e instanceof ExecuteStepRetryError) {
+          step.execution = undefined
+          executedStep = await stepExecutor.executeStep(
+            client,
+            step,
+            e.retryParams
+          )
+        } else {
+          throw e
+        }
+      }
 
       // We may reach this point if user interaction isn't allowed. We want to stop execution until we resume it
       if (executedStep.execution?.status !== 'DONE') {

package/src/core/prepareRestart.ts

@@ -4,25 +4,26 @@ export const prepareRestart = (route: RouteExtended) => {
   for (let index = 0; index < route.steps.length; index++) {
     const step = route.steps[index]
     if (step.execution) {
-      // Find the index of the last process that has tx hash, taskId, or signed messages
-      const lastValidIndex = step.execution.process.findLastIndex(
-        (process) =>
-          (!!process.txHash ||
-            !!process.taskId ||
-            !!process.signedTypedData?.length) &&
-          process.status !== 'FAILED'
+      // Find the index of the last action that has tx hash, taskId, or signed messages
+      const lastValidIndex = step.execution.actions.findLastIndex(
+        (action) =>
+          ['SWAP', 'CROSS_CHAIN', 'RECEIVING_CHAIN'].includes(action.type) &&
+          (!!action.txHash || !!action.taskId) &&
+          action.status !== 'FAILED'
       )
 
-      // Keep all processes up to the one with tx hash
+      // Keep all actions up to the one with tx hash
       if (lastValidIndex >= 0) {
-        step.execution.process = step.execution.process.slice(
+        step.execution.actions = step.execution.actions.slice(
           0,
           lastValidIndex + 1
         )
       } else {
-        // If no tx hash exists, reset the process array
-        step.execution.process = []
+        // If no tx hash exists, reset the actions array
+        step.execution.actions = []
       }
+      // Reset the last action type
+      step.execution.lastActionType = undefined
     }
     step.transactionRequest = undefined
   }

package/src/core/storage.ts

@@ -0,0 +1,42 @@
+export interface SDKStorage {
+  get(key: string): string | null | Promise<string | null>
+  set(key: string, value: string): void | Promise<void>
+  remove(key: string): void | Promise<void>
+}
+
+export class LocalStorageAdapter implements SDKStorage {
+  get(key: string): string | null {
+    return window.localStorage.getItem(key)
+  }
+
+  set(key: string, value: string): void {
+    window.localStorage.setItem(key, value)
+  }
+
+  remove(key: string): void {
+    window.localStorage.removeItem(key)
+  }
+}
+
+export class InMemoryStorage implements SDKStorage {
+  private store = new Map<string, string>()
+
+  get(key: string): string | null {
+    return this.store.get(key) ?? null
+  }
+
+  set(key: string, value: string): void {
+    this.store.set(key, value)
+  }
+
+  remove(key: string): void {
+    this.store.delete(key)
+  }
+}
+
+export function createDefaultStorage(): SDKStorage {
+  if (typeof window !== 'undefined' && window.localStorage) {
+    return new LocalStorageAdapter()
+  }
+  return new InMemoryStorage()
+}

package/src/core/tasks/CheckBalanceTask.ts

@@ -0,0 +1,29 @@
+import { LiFiErrorCode } from '../../errors/constants.js'
+import { TransactionError } from '../../errors/errors.js'
+import type { StepExecutorContext, TaskResult } from '../../types/execution.js'
+import { BaseStepExecutionTask } from '../BaseStepExecutionTask.js'
+import { checkBalance } from './helpers/checkBalance.js'
+
+export class CheckBalanceTask extends BaseStepExecutionTask {
+  async run(context: StepExecutorContext): Promise<TaskResult> {
+    const { client, step, statusManager, isBridgeExecution } = context
+
+    statusManager.initializeAction({
+      step,
+      type: isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP',
+      chainId: step.action.fromChainId,
+      status: 'STARTED',
+    })
+
+    const walletAddress = step.action.fromAddress
+    if (!walletAddress) {
+      throw new TransactionError(
+        LiFiErrorCode.InternalError,
+        'The wallet address is undefined.'
+      )
+    }
+
+    await checkBalance(client, walletAddress, step)
+    return { status: 'COMPLETED' }
+  }
+}

package/src/core/tasks/PrepareTransactionTask.ts

@@ -0,0 +1,62 @@
+import { getStepTransaction } from '../../actions/getStepTransaction.js'
+import { LiFiErrorCode } from '../../errors/constants.js'
+import { TransactionError } from '../../errors/errors.js'
+import type { StepExecutorContext, TaskResult } from '../../types/execution.js'
+import { BaseStepExecutionTask } from '../BaseStepExecutionTask.js'
+import { stepComparison } from './helpers/stepComparison.js'
+
+export class PrepareTransactionTask extends BaseStepExecutionTask {
+  async run(context: StepExecutorContext): Promise<TaskResult> {
+    const {
+      client,
+      step,
+      statusManager,
+      allowUserInteraction,
+      executionOptions,
+      isBridgeExecution,
+    } = context
+
+    const action = statusManager.findAction(
+      step,
+      isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP'
+    )
+
+    if (!action) {
+      throw new TransactionError(
+        LiFiErrorCode.TransactionUnprepared,
+        'Unable to prepare transaction. Action not found.'
+      )
+    }
+
+    if (!step.transactionRequest) {
+      const { execution, ...stepBase } = step
+      const updatedStep = await getStepTransaction(client, stepBase)
+      const comparedStep = await stepComparison(
+        statusManager,
+        step,
+        updatedStep,
+        allowUserInteraction,
+        executionOptions
+      )
+      Object.assign(step, {
+        ...comparedStep,
+        execution: step.execution,
+      })
+    }
+
+    if (!step.transactionRequest?.data) {
+      throw new TransactionError(
+        LiFiErrorCode.TransactionUnprepared,
+        'Unable to prepare transaction. Transaction request data is not found.'
+      )
+    }
+
+    statusManager.updateAction(step, action.type, 'ACTION_REQUIRED')
+
+    if (!allowUserInteraction) {
+      return { status: 'PAUSED' }
+    }
+
+    return { status: 'COMPLETED' }
+  }
+}