@lifi/sdk 3.0.0-beta.0 → 3.0.0-beta.2

package/src/_types/utils/parseError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseError.d.ts","sourceRoot":"","sources":["../../utils/parseError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAMpD,OAAO,EAIL,SAAS,EAOV,MAAM,aAAa,CAAA;AAGpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,eAAO,MAAM,UAAU,MAClB,GAAG,SACC,QAAQ,YACL,OAAO,KAChB,QAAQ,SAAS,CAyJnB,CAAA"}
+{"version":3,"file":"parseError.d.ts","sourceRoot":"","sources":["../../utils/parseError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAMpD,OAAO,EAIL,SAAS,EAOV,MAAM,aAAa,CAAA;AAGpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,eAAO,MAAM,UAAU,MAClB,GAAG,SACC,QAAQ,YACL,OAAO,KAChB,OAAO,CAAC,SAAS,CAyJnB,CAAA"}

package/src/_types/utils/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../utils/utils.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,IAAI,OAAQ,MAAM,KAAG,QAAQ,SAAS,CAIlD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,gBAChB,MAAM,QAAQ,CAAC,GAAG,SAAS,CAAC,uBAErC,QAAQ,CAAC,CAWX,CAAA;AAED,eAAO,MAAM,aAAa,YAAa,MAAM,KAAG,OAK/C,CAAA;AAED,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,OAUtD,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../utils/utils.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,IAAI,OAAQ,MAAM,KAAG,OAAO,CAAC,SAAS,CAIlD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAU,CAAC,YAC3B,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,uBAErC,OAAO,CAAC,CAAC,CAWX,CAAA;AAED,eAAO,MAAM,aAAa,YAAa,MAAM,KAAG,OAK/C,CAAA;AAED,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,OAUtD,CAAA"}

package/src/_types/version.d.ts

@@ -1,3 +1,3 @@
 export declare const name = "@lifi/sdk";
-export declare const version = "3.0.0-beta.0";
+export declare const version = "3.0.0-beta.2";
 //# sourceMappingURL=version.d.ts.map

package/src/core/EVM/getAllowance.ts

@@ -1,4 +1,4 @@
-import type { ChainId, Token } from '@lifi/types'
+import type { BaseToken, ChainId } from '@lifi/types'
 import type { Address } from 'viem'
 import { getContract } from 'viem'
 import { isNativeTokenAddress } from '../../utils/utils.js'
@@ -83,7 +83,7 @@ export const getAllowanceMulticall = async (
  * @returns Returns allowance
  */
 export const getTokenAllowance = async (
-  token: Token,
+  token: BaseToken,
   ownerAddress: string,
   spenderAddress: string
 ): Promise<bigint | undefined> => {

package/src/core/EVM/setAllowance.ts

@@ -68,11 +68,11 @@ export const setAllowance = async (
 /**
  * Set approval for a certain token and amount.
  * @param request - The approval request
- * @param request.walletClient
- * @param request.token
- * @param request.spenderAddress
- * @param request.amount
- * @param request.infiniteApproval
+ * @param request.walletClient - The Viem wallet client used to send the transaction
+ * @param request.token - The token for which to set the allowance
+ * @param request.spenderAddress - The address of the spender
+ * @param request.amount - The amount of tokens to approve
+ * @param request.infiniteApproval - If true, sets the approval to the maximum uint256 value
  * @returns Returns Hash or nothing
  */
 export const setTokenAllowance = async ({
@@ -110,9 +110,9 @@ export const setTokenAllowance = async ({
 /**
  * Revoke approval for a certain token.
  * @param request - The revoke request
- * @param request.walletClient
- * @param request.token
- * @param request.spenderAddress
+ * @param request.walletClient - The Viem wallet client used to send the transaction
+ * @param request.token - The token for which to revoke the allowance
+ * @param request.spenderAddress - The address of the spender
  * @returns Returns Hash or nothing
  */
 export const revokeTokenApproval = async ({

package/src/core/EVM/types.ts

@@ -1,4 +1,4 @@
-import { ChainType, type Token } from '@lifi/types'
+import { ChainType, type BaseToken } from '@lifi/types'
 import type { Hash, WalletClient } from 'viem'
 import type { SwitchChainHook } from '../types.js'
 import { type SDKProvider } from '../types.js'
@@ -19,24 +19,24 @@ export function isEVM(provider: SDKProvider): provider is EVMProvider {
 }
 
 export type TokenSpender = {
-  token: Token
+  token: BaseToken
   spenderAddress: string
 }
 
 export type TokenAllowance = {
-  token: Token
+  token: BaseToken
   allowance?: bigint
 }
 
 export type TokenSpenderAllowance = {
-  token: Token
+  token: BaseToken
   spenderAddress: string
   allowance?: bigint
 }
 
 export interface ApproveTokenRequest {
   walletClient: WalletClient
-  token: Token
+  token: BaseToken
   spenderAddress: string
   amount: bigint
   infiniteApproval?: boolean
@@ -44,7 +44,7 @@ export interface ApproveTokenRequest {
 
 export interface RevokeApprovalRequest {
   walletClient: WalletClient
-  token: Token
+  token: BaseToken
   spenderAddress: string
 }
 

package/src/core/Solana/KeypairWalletAdapter.ts

@@ -16,7 +16,7 @@ import type {
   VersionedTransaction,
 } from '@solana/web3.js'
 import { Keypair } from '@solana/web3.js'
-import { decode } from 'bs58'
+import * as bs58 from 'bs58'
 
 export const KeypairWalletName =
   'Keypair Wallet' as WalletName<'Keypair Wallet'>
@@ -48,7 +48,7 @@ export class KeypairWalletAdapter
       throw new WalletConfigError()
     }
     super()
-    this._keypair = Keypair.fromSecretKey(decode(privateKey))
+    this._keypair = Keypair.fromSecretKey(bs58.decode(privateKey))
   }
 
   get connecting() {
@@ -67,7 +67,7 @@ export class KeypairWalletAdapter
     if (!privateKey) {
       throw new WalletConfigError()
     }
-    this._keypair = Keypair.fromSecretKey(decode(privateKey))
+    this._keypair = Keypair.fromSecretKey(bs58.decode(privateKey))
   }
 
   async disconnect(): Promise<void> {

package/src/core/Solana/SolanaStepExecutor.ts

@@ -213,9 +213,13 @@ export class SolanaStepExecutor extends BaseStepExecutor {
         }
 
         if (confirmedTx?.err) {
+          const reason =
+            typeof confirmedTx.err === 'object'
+              ? JSON.stringify(confirmedTx.err)
+              : confirmedTx.err
           throw new TransactionError(
             LiFiErrorCode.TransactionFailed,
-            `Transaction failed: ${confirmedTx?.err}`
+            `Transaction failed: ${reason}`
           )
         }
 
@@ -260,6 +264,7 @@ export class SolanaStepExecutor extends BaseStepExecutor {
     }
 
     // STEP 5: Wait for the receiving chain
+    const processTxHash = process.txHash
     if (isBridgeExecution) {
       process = this.statusManager.findOrCreateProcess(
         step,
@@ -269,11 +274,11 @@ export class SolanaStepExecutor extends BaseStepExecutor {
     }
     let statusResponse: FullStatusData
     try {
-      if (!process.txHash) {
+      if (!processTxHash) {
         throw new Error('Transaction hash is undefined.')
       }
       statusResponse = (await waitForReceivingTransaction(
-        process.txHash,
+        processTxHash,
         this.statusManager,
         process.type,
         step

package/src/core/StatusManager.ts

@@ -1,11 +1,11 @@
 import type {
   Execution,
+  ExecutionStatus,
   LiFiStep,
   Process,
+  ProcessStatus,
   ProcessType,
-  Status,
 } from '@lifi/types'
-import { emptyExecution } from '@lifi/types'
 import { executionState } from './executionState.js'
 import type { LiFiStepExtended } from './types.js'
 import { getProcessMessage } from './utils.js'
@@ -44,8 +44,10 @@ export class StatusManager {
    */
   initExecutionObject = (step: LiFiStepExtended): Execution => {
     if (!step.execution) {
-      step.execution = structuredClone<Execution>(emptyExecution)
-      step.execution.status = 'PENDING'
+      step.execution = {
+        status: 'PENDING',
+        process: [],
+      }
       this.updateStepInRoute(step)
     }
 
@@ -67,7 +69,7 @@ export class StatusManager {
    */
   updateExecution(
     step: LiFiStepExtended,
-    status: Status,
+    status: ExecutionStatus,
     execution?: Partial<Execution>
   ): LiFiStep {
     if (!step.execution) {
@@ -94,7 +96,7 @@ export class StatusManager {
   findOrCreateProcess = (
     step: LiFiStepExtended,
     type: ProcessType,
-    status?: Status
+    status?: ProcessStatus
   ): Process => {
     if (!step.execution?.process) {
       throw new Error("Execution hasn't been initialized.")
@@ -133,7 +135,7 @@ export class StatusManager {
   updateProcess = (
     step: LiFiStepExtended,
     type: ProcessType,
-    status: Status,
+    status: ProcessStatus,
     params?: OptionalParameters
   ): Process => {
     if (!step.execution) {

package/src/core/prepareRestart.ts

@@ -7,68 +7,12 @@ export const prepareRestart = async (route: RouteExtended) => {
     const stepHasFailed = step.execution?.status === 'FAILED'
 
     if (stepHasFailed) {
-      // await handleErrorType(walletClient, step)
       deleteFailedProcesses(step)
       deleteTransactionData(step)
     }
   }
 }
 
-// const handleErrorType = async (walletClient: WalletClient, step: LiFiStep) => {
-//   const client = walletClient.extend(publicActions)
-
-//   const isGasLimitError = step.execution?.process.some(
-//     (p) => p.error?.code === LiFiErrorCode.GasLimitError
-//   )
-//   const isGasPriceError = step.execution?.process.some(
-//     (p) => p.error?.code === LiFiErrorCode.TransactionUnderpriced
-//   )
-
-//   const { transactionRequest } = step
-
-// if (isGasLimitError) {
-//   if (transactionRequest) {
-//     let gasLimit = transactionRequest.gasLimit
-
-//     try {
-//       gasLimit = await client.estimateGas(transactionRequest)
-//     } catch (error) {}
-
-//     if (gasLimit) {
-//       transactionRequest.gasLimit = BigNumber.from(
-//         `${(BigInt(gasLimit.toString()) * 125n) / 100n}`
-//       )
-//     }
-//   }
-
-//   step.estimate.gasCosts?.forEach(
-//     (gasCost) =>
-//       (gasCost.limit = `${Math.round(Number(gasCost.limit) * 1.25)}`)
-//   )
-// }
-
-// if (isGasPriceError) {
-//   if (transactionRequest) {
-//     let gasPrice = transactionRequest.gasPrice
-
-//     try {
-//       gasPrice = await client.getGasPrice()
-//     } catch (error) {}
-
-//     if (gasPrice) {
-//       transactionRequest.gasPrice = BigNumber.from(
-//         `${(BigInt(gasPrice.toString()) * 125n) / 100n}`
-//       )
-//     }
-//   }
-
-//   step.estimate.gasCosts?.forEach(
-//     (gasCost) =>
-//       (gasCost.price = `${Math.round(Number(gasCost.price) * 1.25)}`)
-//   )
-// }
-// }
-
 const deleteFailedProcesses = (step: LiFiStepExtended) => {
   if (step.execution) {
     step.execution.process = step.execution.process.filter(

package/src/core/utils.ts

@@ -1,12 +1,15 @@
 import {
   type LiFiStep,
+  type ProcessStatus,
   type ProcessType,
-  type Status,
   type StatusMessage,
   type Substatus,
 } from '@lifi/types'
 
-const processMessages: Record<ProcessType, Partial<Record<Status, string>>> = {
+const processMessages: Record<
+  ProcessType,
+  Partial<Record<ProcessStatus, string>>
+> = {
   TOKEN_ALLOWANCE: {
     STARTED: 'Setting token allowance.',
     PENDING: 'Waiting for token allowance.',
@@ -61,7 +64,7 @@ const substatusMessages: Record<
 
 export function getProcessMessage(
   type: ProcessType,
-  status: Status
+  status: ProcessStatus
 ): string | undefined {
   const processMessage = processMessages[type][status]
   return processMessage

package/src/index.ts

@@ -1,8 +1,14 @@
 export * from '@lifi/types'
 export { config } from './config.js'
 export { EVM } from './core/EVM/EVM.js'
-export { getTokenAllowance } from './core/EVM/getAllowance.js'
-export { setTokenAllowance } from './core/EVM/setAllowance.js'
+export {
+  getTokenAllowance,
+  getTokenAllowanceMulticall,
+} from './core/EVM/getAllowance.js'
+export {
+  revokeTokenApproval,
+  setTokenAllowance,
+} from './core/EVM/setAllowance.js'
 export type {
   MultisigConfig,
   MultisigTransaction,

package/src/services/balance.ts

@@ -66,9 +66,7 @@ export const getTokenBalancesByChain = async (
   const tokenList = Object.values(tokensByChain).flat()
   const invalidTokens = tokenList.filter((token) => !isToken(token))
   if (invalidTokens.length) {
-    throw new ValidationError(
-      `Invalid token passed: address "${invalidTokens[0].address}" on chainId "${invalidTokens[0].chainId}"`
-    )
+    throw new ValidationError(`Invalid tokens passed.`)
   }
 
   const tokenAmountsByChain: { [chainId: number]: TokenAmount[] } = {}

package/src/version.ts

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