@lifi/sdk 3.3.0-alpha.3 → 3.3.0-beta.1

package/src/core/EVM/getEVMBalance.ts

@@ -19,11 +19,11 @@ export const getEVMBalance = async (
     return []
   }
   const { chainId } = tokens[0]
-  tokens.forEach((token) => {
+  for (const token of tokens) {
     if (token.chainId !== chainId) {
-      console.warn(`Requested tokens have to be on the same chain.`)
+      console.warn('Requested tokens have to be on the same chain.')
     }
-  })
+  }
 
   const multicallAddress = await getMulticallAddress(chainId)
 
@@ -34,9 +34,8 @@ export const getEVMBalance = async (
       walletAddress,
       multicallAddress
     )
-  } else {
-    return getEVMBalanceDefault(chainId, tokens, walletAddress)
   }
+  return getEVMBalanceDefault(chainId, tokens, walletAddress)
 }
 
 const getEVMBalanceMulticall = async (

package/src/core/EVM/parseEVMErrors.ts

@@ -1,8 +1,8 @@
-import { type LiFiStep, type Process } from '@lifi/types'
-import { TransactionError, UnknownError } from '../../errors/errors.js'
+import type { LiFiStep, Process } from '@lifi/types'
 import { SDKError } from '../../errors/SDKError.js'
+import { BaseError } from '../../errors/baseError.js'
 import { ErrorMessage, LiFiErrorCode } from '../../errors/constants.js'
-import { BaseError } from '../../utils/index.js'
+import { TransactionError, UnknownError } from '../../errors/errors.js'
 import { fetchTxErrorDetails } from '../../helpers.js'
 
 export const parseEVMErrors = async (

package/src/core/EVM/publicClient.ts

@@ -1,7 +1,7 @@
 import { ChainId } from '@lifi/types'
 import type { Client } from 'viem'
-import { createClient, fallback, http, webSocket } from 'viem'
-import { mainnet, type Chain } from 'viem/chains'
+import { http, createClient, fallback, webSocket } from 'viem'
+import { type Chain, mainnet } from 'viem/chains'
 import { config } from '../../config.js'
 import { getRpcUrls } from '../rpc.js'
 

package/src/core/EVM/switchChain.ts

@@ -39,11 +39,11 @@ export const switchChain = async (
   step.execution = statusManager.initExecutionObject(step)
   statusManager.updateExecution(step, 'ACTION_REQUIRED')
 
-  let switchProcess = statusManager.findOrCreateProcess(
+  let switchProcess = statusManager.findOrCreateProcess({
     step,
-    'SWITCH_CHAIN',
-    'ACTION_REQUIRED'
-  )
+    type: 'SWITCH_CHAIN',
+    status: 'ACTION_REQUIRED',
+  })
 
   if (!allowUserInteraction) {
     return
@@ -51,7 +51,7 @@ export const switchChain = async (
 
   try {
     const updatedClient = await switchChainHook?.(step.action.fromChainId)
-    let updatedChainId
+    let updatedChainId: number | undefined
     if (updatedClient) {
       updatedChainId = await getChainId(updatedClient)
     }

package/src/core/EVM/types.ts

@@ -1,7 +1,7 @@
-import { ChainType, type BaseToken } from '@lifi/types'
+import { type BaseToken, ChainType } from '@lifi/types'
 import type { Client, Hash } from 'viem'
 import type { SwitchChainHook } from '../types.js'
-import { type SDKProvider } from '../types.js'
+import type { SDKProvider } from '../types.js'
 
 export interface EVMProviderOptions {
   getWalletClient?: () => Promise<Client>

package/src/core/EVM/utils.ts

@@ -1,4 +1,4 @@
-import { type ChainId } from '@lifi/types'
+import type { ChainId } from '@lifi/types'
 import type { Client, Transaction } from 'viem'
 import { getBlock } from 'viem/actions'
 import { config } from '../../config.js'
@@ -19,10 +19,10 @@ export const getMaxPriorityFeePerGas = async (
     return
   }
 
-  const maxPriorityFeePerGasSum = maxPriorityFeePerGasList.reduce(
-    (acc, value) => (acc += value),
-    0n
-  )
+  let maxPriorityFeePerGasSum = 0n
+  for (const value of maxPriorityFeePerGasList) {
+    maxPriorityFeePerGasSum += value
+  }
 
   const maxPriorityFeePerGasMedian = median(maxPriorityFeePerGasList) ?? 0n
 

package/src/core/EVM/waitForTransactionReceipt.ts

@@ -8,7 +8,8 @@ import type {
   TransactionReceipt,
 } from 'viem'
 import { waitForTransactionReceipt as waitForTransactionReceiptInternal } from 'viem/actions'
-import { LiFiErrorCode, TransactionError } from '../../utils/index.js'
+import { LiFiErrorCode } from '../../errors/constants.js'
+import { TransactionError } from '../../errors/errors.js'
 import { getPublicClient } from './publicClient.js'
 import { retryCount, retryDelay } from './utils.js'
 
@@ -75,7 +76,7 @@ async function waitForReceipt(
       retryCount,
       retryDelay,
     })
-  } catch (error) {
+  } catch {
     // We can ignore errors from waitForTransactionReceipt as we have a status check fallback
   }
 

package/src/core/Solana/Solana.ts

@@ -19,7 +19,7 @@ export function Solana(options?: SolanaProviderOptions): SolanaProvider {
       options: StepExecutorOptions
     ): Promise<SolanaStepExecutor> {
       if (!_options.getWalletAdapter) {
-        throw new Error(`getWalletAdapter is not provided.`)
+        throw new Error('getWalletAdapter is not provided.')
       }
 
       const walletAdapter = await _options.getWalletAdapter()

package/src/core/Solana/SolanaStepExecutor.ts

@@ -1,9 +1,9 @@
 import type { ExtendedTransactionInfo, FullStatusData } from '@lifi/types'
-import { type SignerWalletAdapter } from '@solana/wallet-adapter-base'
+import type { SignerWalletAdapter } from '@solana/wallet-adapter-base'
 import {
-  VersionedTransaction,
   type SendOptions,
   type SignatureResult,
+  VersionedTransaction,
 } from '@solana/web3.js'
 import bs58 from 'bs58'
 import { withTimeout } from 'viem'
@@ -12,7 +12,7 @@ import { LiFiErrorCode } from '../../errors/constants.js'
 import { TransactionError } from '../../errors/errors.js'
 import { getStepTransaction } from '../../services/api.js'
 import { base64ToUint8Array } from '../../utils/base64ToUint8Array.js'
-import { getTransactionFailedMessage } from '../../utils/index.js'
+import { getTransactionFailedMessage } from '../../utils/getTransactionMessage.js'
 import { sleep } from '../../utils/sleep.js'
 import { BaseStepExecutor } from '../BaseStepExecutor.js'
 import { checkBalance } from '../checkBalance.js'
@@ -59,10 +59,10 @@ export class SolanaStepExecutor extends BaseStepExecutor {
     const currentProcessType = isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP'
 
     // STEP 2: Get transaction
-    let process = this.statusManager.findOrCreateProcess(
+    let process = this.statusManager.findOrCreateProcess({
       step,
-      currentProcessType
-    )
+      type: currentProcessType,
+    })
 
     if (process.status !== 'DONE') {
       try {
@@ -88,10 +88,10 @@ export class SolanaStepExecutor extends BaseStepExecutor {
             this.allowUserInteraction,
             this.executionOptions
           )
-          step = {
+          Object.assign(step, {
             ...comparedStep,
             execution: step.execution,
-          }
+          })
         }
 
         if (!step.transactionRequest?.data) {
@@ -294,11 +294,12 @@ export class SolanaStepExecutor extends BaseStepExecutor {
     // STEP 5: Wait for the receiving chain
     const processTxHash = process.txHash
     if (isBridgeExecution) {
-      process = this.statusManager.findOrCreateProcess(
+      process = this.statusManager.findOrCreateProcess({
         step,
-        'RECEIVING_CHAIN',
-        'PENDING'
-      )
+        type: 'RECEIVING_CHAIN',
+        status: 'PENDING',
+        chainId: toChain.id,
+      })
     }
     let statusResponse: FullStatusData
     try {

package/src/core/Solana/connection.ts

@@ -13,7 +13,6 @@ export const getSolanaConnection = async (): Promise<Connection> => {
     const rpcUrl = await getRpcUrl(ChainId.SOL)
     connection = new Connection(rpcUrl)
     return connection
-  } else {
-    return connection
   }
+  return connection
 }

package/src/core/Solana/getSolanaBalance.ts

@@ -12,11 +12,11 @@ export const getSolanaBalance = async (
     return []
   }
   const { chainId } = tokens[0]
-  tokens.forEach((token) => {
+  for (const token of tokens) {
     if (token.chainId !== chainId) {
-      console.warn(`Requested tokens have to be on the same chain.`)
+      console.warn('Requested tokens have to be on the same chain.')
     }
-  })
+  }
 
   return getSolanaBalanceDefault(chainId, tokens, walletAddress)
 }

package/src/core/Solana/isSVMAddress.ts

@@ -4,7 +4,7 @@ export function isSVMAddress(address: string): boolean {
   try {
     new PublicKey(address)
     return true
-  } catch (error) {
+  } catch (_error) {
     return false
   }
 }

package/src/core/Solana/parseSolanaErrors.ts

@@ -1,8 +1,8 @@
 import type { LiFiStep, Process } from '@lifi/types'
+import { SDKError } from '../../errors/SDKError.js'
 import { BaseError } from '../../errors/baseError.js'
 import { ErrorMessage, LiFiErrorCode } from '../../errors/constants.js'
 import { TransactionError, UnknownError } from '../../errors/errors.js'
-import { SDKError } from '../../errors/SDKError.js'
 
 export const parseSolanaErrors = async (
   e: Error,

package/src/core/Solana/types.ts

@@ -1,6 +1,6 @@
 import { ChainType } from '@lifi/types'
 import type { SignerWalletAdapter } from '@solana/wallet-adapter-base'
-import { type SDKProvider } from '../types.js'
+import type { SDKProvider } from '../types.js'
 
 export interface SolanaProviderOptions {
   getWalletAdapter?: () => Promise<SignerWalletAdapter>

package/src/core/StatusManager.ts

@@ -1,4 +1,5 @@
 import type {
+  ChainId,
   Execution,
   ExecutionStatus,
   LiFiStep,
@@ -10,19 +11,12 @@ import { executionState } from './executionState.js'
 import { getProcessMessage } from './processMessages.js'
 import type { LiFiStepExtended } from './types.js'
 
-type OptionalParameters = Partial<
-  Pick<
-    Process,
-    | 'doneAt'
-    | 'failedAt'
-    | 'txHash'
-    | 'txLink'
-    | 'error'
-    | 'substatus'
-    | 'substatusMessage'
-    | 'multisigTxHash'
-  >
->
+export type FindOrCreateProcessProps = {
+  step: LiFiStepExtended
+  type: ProcessType
+  chainId?: ChainId
+  status?: ProcessStatus
+}
 
 /**
  * Manages status updates of a route and provides various functions for tracking processes
@@ -88,16 +82,23 @@ export class StatusManager {
 
   /**
    * 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 status By default created procces is set to the STARTED status. We can override new process with the needed status.
+   * @param step.step The step that should contain the new process.
+   * @param step.type Type of the process. Used to identify already existing processes.
+   * @param step.chainId Chain Id of the process.
+   * @param step.status By default created procces is set to the STARTED status. We can override new process with the needed status.
+   * @param root0
+   * @param root0.step
+   * @param root0.type
+   * @param root0.chainId
+   * @param root0.status
    * @returns Returns process.
    */
-  findOrCreateProcess = (
-    step: LiFiStepExtended,
-    type: ProcessType,
-    status?: ProcessStatus
-  ): Process => {
+  findOrCreateProcess = ({
+    step,
+    type,
+    chainId,
+    status,
+  }: FindOrCreateProcessProps): Process => {
     if (!step.execution?.process) {
       throw new Error("Execution hasn't been initialized.")
     }
@@ -117,6 +118,7 @@ export class StatusManager {
       startedAt: Date.now(),
       message: getProcessMessage(type, status ?? 'STARTED'),
       status: status ?? 'STARTED',
+      chainId: chainId,
     }
 
     step.execution.process.push(newProcess)
@@ -136,7 +138,7 @@ export class StatusManager {
     step: LiFiStepExtended,
     type: ProcessType,
     status: ProcessStatus,
-    params?: OptionalParameters
+    params?: Partial<Process>
   ): Process => {
     if (!step.execution) {
       throw new Error("Can't update an empty step execution.")
@@ -178,12 +180,8 @@ export class StatusManager {
     }
     // 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'
-      ),
+      ...step.execution.process.filter((process) => process.status === 'DONE'),
+      ...step.execution.process.filter((process) => process.status !== 'DONE'),
     ]
     this.updateStepInRoute(step) // updates the step in the route
     return currentProcess

package/src/core/UTXO/UTXO.ts

@@ -21,7 +21,7 @@ export function UTXO(options?: UTXOProviderOptions): UTXOProvider {
       options: StepExecutorOptions
     ): Promise<UTXOStepExecutor> {
       if (!_options.getWalletClient) {
-        throw new Error(`Client is not provided.`)
+        throw new Error('Client is not provided.')
       }
 
       const walletClient = await _options.getWalletClient()

package/src/core/UTXO/UTXOStepExecutor.ts

@@ -3,16 +3,13 @@ import {
   type ExtendedTransactionInfo,
   type FullStatusData,
 } from '@lifi/types'
-import { address, networks, Psbt } from 'bitcoinjs-lib'
-import { withRetry, withTimeout, type Client } from 'viem'
+import { Psbt, address, networks } from 'bitcoinjs-lib'
+import { type Client, withTimeout } from 'viem'
 import { config } from '../../config.js'
 import { LiFiErrorCode } from '../../errors/constants.js'
 import { TransactionError } from '../../errors/errors.js'
 import { getStepTransaction } from '../../services/api.js'
-import {
-  getTransactionFailedMessage,
-  waitForResult,
-} from '../../utils/index.js'
+import { getTransactionFailedMessage } from '../../utils/getTransactionMessage.js'
 import { BaseStepExecutor } from '../BaseStepExecutor.js'
 import { checkBalance } from '../checkBalance.js'
 import { getSubstatusMessage } from '../processMessages.js'
@@ -26,6 +23,10 @@ import { waitForReceivingTransaction } from '../waitForReceivingTransaction.js'
 import { getUTXOPublicClient } from './getUTXOPublicClient.js'
 import { parseUTXOErrors } from './parseUTXOErrors.js'
 import { signPsbt } from './utxo-stack/actions/signPsbt.js'
+import {
+  type ReplacementReason,
+  waitForTransaction,
+} from './utxo-stack/actions/waitForTransaction.js'
 
 export interface UTXOStepExecutorOptions extends StepExecutorOptions {
   client: Client
@@ -60,22 +61,25 @@ export class UTXOStepExecutor extends BaseStepExecutor {
     const currentProcessType = isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP'
 
     // STEP 2: Get transaction
-    let process = this.statusManager.findOrCreateProcess(
+    let process = this.statusManager.findOrCreateProcess({
       step,
-      currentProcessType
-    )
+      type: currentProcessType,
+      chainId: fromChain.id,
+    })
 
     const publicClient = await getUTXOPublicClient(ChainId.BTC)
 
     if (process.status !== 'DONE') {
       try {
         let txHash: string
+        let txHex: string
         if (process.txHash) {
           // Make sure that the chain is still correct
           this.checkClient(step)
 
           // Wait for exiting transaction
           txHash = process.txHash
+          txHex = process.txHex
         } else {
           process = this.statusManager.updateProcess(
             step,
@@ -97,10 +101,10 @@ export class UTXOStepExecutor extends BaseStepExecutor {
               this.allowUserInteraction,
               this.executionOptions
             )
-            step = {
+            Object.assign(step, {
               ...comparedStep,
               execution: step.execution,
-            }
+            })
           }
 
           if (!step.transactionRequest?.data) {
@@ -146,24 +150,7 @@ export class UTXOStepExecutor extends BaseStepExecutor {
 
           this.checkClient(step)
 
-          // const toolbox = getToolboxByChain('BTC')({})
-
-          // const apiClient = blockchairApi({ chain: Chain.Bitcoin })
-          // const txFeeRate = await apiClient.getSuggestedTxFee()
-
-          // const tx = await toolbox.buildTx({
-          //   assetValue: {
-          //     bigIntValue: step.transactionRequest.value,
-          //   },
-          //   recipient: step.transactionRequest.to,
-          //   memo: step.transactionRequest.data,
-          //   sender: this.client.account?.address,
-          //   chain: 'BTC',
-          //   apiClient: blockchairApi({ chain: Chain.Bitcoin }),
-          //   feeRate: txFeeRate,
-          // })
-
-          let psbtHex = transactionRequest.data // tx.psbt.toHex()
+          const psbtHex = transactionRequest.data
 
           const psbt = Psbt.fromHex(psbtHex, { network: networks.bitcoin })
 
@@ -190,8 +177,6 @@ export class UTXOStepExecutor extends BaseStepExecutor {
               .values()
           )
 
-          psbtHex = psbt.toHex()
-
           // We give users 10 minutes to sign the transaction or it should be considered expired
           const signedPsbtHex = await withTimeout(
             () =>
@@ -211,10 +196,10 @@ export class UTXOStepExecutor extends BaseStepExecutor {
 
           const signedPsbt = Psbt.fromHex(signedPsbtHex).finalizeAllInputs()
 
-          const transactionHex = signedPsbt.extractTransaction().toHex()
+          txHex = signedPsbt.extractTransaction().toHex()
 
           txHash = await publicClient.sendUTXOTransaction({
-            hex: transactionHex,
+            hex: txHex,
           })
 
           process = this.statusManager.updateProcess(
@@ -224,31 +209,48 @@ export class UTXOStepExecutor extends BaseStepExecutor {
             {
               txHash: txHash,
               txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${txHash}`,
+              txHex,
             }
           )
         }
 
-        // TODO: improve logic to detect RBF transactions
-        await waitForResult(
-          () =>
-            withRetry(
-              async () => {
-                const tx = await publicClient.getUTXOTransaction({
-                  txId: txHash,
-                })
-                // If there are no confirmations, it means the transaction is still in the mempool
-                if (!tx.confirmations) {
-                  return
-                }
-                return tx
-              },
+        let replacementReason: ReplacementReason | undefined
+        const transaction = await waitForTransaction(publicClient, {
+          txId: txHash,
+          txHex,
+          senderAddress: this.client.account?.address,
+          onReplaced: (response) => {
+            replacementReason = response.reason
+            process = this.statusManager.updateProcess(
+              step,
+              process.type,
+              'PENDING',
               {
-                retryCount: 10,
-                delay: 1000,
+                txHash: response.transaction.txid,
+                txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${response.transaction.txid}`,
               }
-            ),
-          10_000
-        )
+            )
+          },
+        })
+
+        if (replacementReason === 'cancelled') {
+          throw new TransactionError(
+            LiFiErrorCode.TransactionCanceled,
+            'User canceled transaction.'
+          )
+        }
+
+        if (transaction.txid !== txHash) {
+          process = this.statusManager.updateProcess(
+            step,
+            process.type,
+            'PENDING',
+            {
+              txHash: transaction.txid,
+              txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${transaction.txid}`,
+            }
+          )
+        }
 
         if (isBridgeExecution) {
           process = this.statusManager.updateProcess(step, process.type, 'DONE')
@@ -274,11 +276,12 @@ export class UTXOStepExecutor extends BaseStepExecutor {
     // STEP 5: Wait for the receiving chain
     const processTxHash = process.txHash
     if (isBridgeExecution) {
-      process = this.statusManager.findOrCreateProcess(
+      process = this.statusManager.findOrCreateProcess({
         step,
-        'RECEIVING_CHAIN',
-        'PENDING'
-      )
+        type: 'RECEIVING_CHAIN',
+        status: 'PENDING',
+        chainId: toChain.id,
+      })
     }
     let statusResponse: FullStatusData
     try {

package/src/core/UTXO/getUTXOAPIPublicClient.ts

@@ -1,11 +1,11 @@
 import {
-  createClient,
-  fallback,
-  rpcSchema,
   type Chain,
   type Client,
   type FallbackTransport,
   type HttpTransport,
+  createClient,
+  fallback,
+  rpcSchema,
 } from 'viem'
 import { config } from '../../config.js'
 import { UTXOAPIActions } from './utxo-stack/decorators/UTXOAPIActions.js'

package/src/core/UTXO/getUTXOBalance.ts

@@ -10,12 +10,11 @@ export const getUTXOBalance = async (
     return []
   }
   const { chainId } = tokens[0]
-  tokens.forEach((token) => {
+  for (const token of tokens) {
     if (token.chainId !== chainId) {
-      console.warn(`Requested tokens have to be on the same chain.`)
+      console.warn('Requested tokens have to be on the same chain.')
     }
-  })
-
+  }
   const apiClient = await getUTXOAPIPublicClient(ChainId.BTC)
   const client = await getUTXOPublicClient(ChainId.BTC)
   const [balance, blockCount] = await Promise.all([

package/src/core/UTXO/getUTXOPublicClient.ts

@@ -1,12 +1,12 @@
 import {
-  createClient,
-  fallback,
   http,
-  rpcSchema,
   type Chain,
   type Client,
   type FallbackTransport,
   type HttpTransport,
+  createClient,
+  fallback,
+  rpcSchema,
 } from 'viem'
 import { config } from '../../config.js'
 import { getRpcUrls } from '../rpc.js'
@@ -48,6 +48,7 @@ export const getUTXOPublicClient = async (chainId: number) => {
       chain,
       rpcSchema: rpcSchema<UTXOSchema>(),
       transport: fallback(fallbackTransports),
+      pollingInterval: 10_000,
     }).extend(UTXOActions)
     publicClients[chainId] = client
   }