@lifi/sdk 3.7.1 → 3.7.3

package/src/core/EVM/getAllowance.ts

@@ -1,8 +1,9 @@
 import type { BaseToken, ChainId } from '@lifi/types'
-import type { Address } from 'viem'
+import type { Address, Client } from 'viem'
 import { multicall, readContract } from 'viem/actions'
 import { isNativeTokenAddress } from '../../utils/isZeroAddress.js'
 import { allowanceAbi } from './abi.js'
+import { getActionWithFallback } from './getActionWithFallback.js'
 import { getPublicClient } from './publicClient.js'
 import type {
   TokenAllowance,
@@ -12,19 +13,23 @@ import type {
 import { getMulticallAddress } from './utils.js'
 
 export const getAllowance = async (
-  chainId: ChainId,
+  client: Client,
   tokenAddress: Address,
   ownerAddress: Address,
   spenderAddress: Address
 ): Promise<bigint> => {
-  const client = await getPublicClient(chainId)
   try {
-    const approved = (await readContract(client, {
-      address: tokenAddress as Address,
-      abi: allowanceAbi,
-      functionName: 'allowance',
-      args: [ownerAddress, spenderAddress],
-    })) as bigint
+    const approved = await getActionWithFallback(
+      client,
+      readContract,
+      'readContract',
+      {
+        address: tokenAddress as Address,
+        abi: allowanceAbi,
+        functionName: 'allowance' as const,
+        args: [ownerAddress, spenderAddress] as const,
+      }
+    )
     return approved
   } catch (_e) {
     return 0n
@@ -32,6 +37,7 @@ export const getAllowance = async (
 }
 
 export const getAllowanceMulticall = async (
+  client: Client,
   chainId: ChainId,
   tokens: TokenSpender[],
   ownerAddress: Address
@@ -44,8 +50,6 @@ export const getAllowanceMulticall = async (
     throw new Error(`No multicall address configured for chainId ${chainId}.`)
   }
 
-  const client = await getPublicClient(chainId)
-
   const contracts = tokens.map((token) => ({
     address: token.token.address as Address,
     abi: allowanceAbi,
@@ -53,7 +57,7 @@ export const getAllowanceMulticall = async (
     args: [ownerAddress, token.spenderAddress],
   }))
 
-  const results = await multicall(client, {
+  const results = await getActionWithFallback(client, multicall, 'multicall', {
     contracts,
     multicallAddress: multicallAddress as Address,
   })
@@ -88,8 +92,10 @@ export const getTokenAllowance = async (
     return
   }
 
+  const client = await getPublicClient(token.chainId)
+
   const approved = await getAllowance(
-    token.chainId,
+    client,
     token.address as Address,
     ownerAddress,
     spenderAddress
@@ -126,8 +132,10 @@ export const getTokenAllowanceMulticall = async (
   const allowances = (
     await Promise.all(
       chainKeys.map(async (chainId) => {
+        const client = await getPublicClient(chainId)
         // get allowances for current chain and token list
         return getAllowanceMulticall(
+          client,
           chainId,
           tokenDataByChain[chainId],
           ownerAddress

package/src/core/EVM/getEVMBalance.ts

@@ -62,12 +62,14 @@ const getEVMBalanceMulticall = async (
       args: [walletAddress],
     }
   })
-  const blockNumber = await getBlockNumber(client)
-  const results = await multicall(client, {
-    contracts,
-    multicallAddress: multicallAddress as Address,
-    blockNumber,
-  })
+
+  const [blockNumber, results] = await Promise.all([
+    getBlockNumber(client),
+    multicall(client, {
+      contracts,
+      multicallAddress: multicallAddress as Address,
+    }),
+  ])
 
   if (!results.length) {
     return []
@@ -88,7 +90,7 @@ const getEVMBalanceDefault = async (
   walletAddress: Address
 ): Promise<TokenAmount[]> => {
   const client = await getPublicClient(chainId)
-  const blockNumber = await getBlockNumber(client)
+
   const queue: Promise<bigint>[] = tokens.map((token) => {
     if (isZeroAddress(token.address)) {
       return getBalance(client, {
@@ -103,7 +105,10 @@ const getEVMBalanceDefault = async (
     }) as Promise<bigint>
   })
 
-  const results = await Promise.allSettled(queue)
+  const [blockNumber, results] = await Promise.all([
+    getBlockNumber(client),
+    Promise.allSettled(queue),
+  ])
 
   const tokenAmounts: TokenAmount[] = tokens.map((token, index) => {
     const result = results[index]

package/src/core/EVM/parseEVMErrors.ts

@@ -1,4 +1,9 @@
 import type { LiFiStep } from '@lifi/types'
+import {
+  AtomicReadyWalletRejectedUpgradeError,
+  TransactionExecutionError,
+  UserRejectedRequestError,
+} from 'viem'
 import { SDKError } from '../../errors/SDKError.js'
 import { BaseError } from '../../errors/baseError.js'
 import { ErrorMessage, LiFiErrorCode } from '../../errors/constants.js'
@@ -28,8 +33,8 @@ const handleSpecificErrors = async (
   process?: Process
 ) => {
   if (
-    e.name === 'UserRejectedRequestError' ||
-    e.cause?.name === 'UserRejectedRequestError'
+    e.name === UserRejectedRequestError.name ||
+    e.cause?.name === UserRejectedRequestError.name
   ) {
     return new TransactionError(LiFiErrorCode.SignatureRejected, e.message, e)
   }
@@ -41,7 +46,7 @@ const handleSpecificErrors = async (
   if (
     e.cause?.code === -32000 ||
     // Safe doesn't return proper code, but the error details includes 'rejected'
-    (e.name === 'TransactionExecutionError' &&
+    (e.name === TransactionExecutionError.name &&
       e.cause?.details?.includes('rejected'))
   ) {
     return new TransactionError(LiFiErrorCode.SignatureRejected, e.message, e)
@@ -84,3 +89,17 @@ const handleSpecificErrors = async (
 
   return new UnknownError(e.message || ErrorMessage.UnknownError, e)
 }
+
+export const isAtomicReadyWalletRejectedUpgradeError = (e: any) => {
+  if (e.cause?.code === AtomicReadyWalletRejectedUpgradeError.code) {
+    return true
+  }
+
+  const details = e.cause?.details?.toLowerCase()
+  const isTransactionError = e.name === TransactionExecutionError.name
+  const hasRejectedUpgrade =
+    details?.includes('rejected') && details?.includes('upgrade')
+  const has7702ErrorCode = details?.includes('7702')
+
+  return isTransactionError && (hasRejectedUpgrade || has7702ErrorCode)
+}

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

@@ -10,6 +10,7 @@ import type { Address, Client, Hex } from 'viem'
 import type { TypedDataDomain } from 'viem'
 import { multicall, readContract } from 'viem/actions'
 import { eip2612Abi, eip2612Types } from '../abi.js'
+import { getActionWithFallback } from '../getActionWithFallback.js'
 import { getMulticallAddress } from '../utils.js'
 import type { NativePermitData } from './types.js'
 
@@ -35,6 +36,13 @@ const EIP712_DOMAIN_TYPEHASH =
 const EIP712_DOMAIN_TYPEHASH_WITH_SALT =
   '0x36c25de3e541d5d970f66e4210d728721220fff5c077cc6cd008b3a0c62adab7' as Hex
 
+export type GetNativePermitParams = {
+  chainId: number
+  tokenAddress: Address
+  spenderAddress: Address
+  amount: bigint
+}
+
 function makeDomainSeparator({
   name,
   version,
@@ -144,10 +152,7 @@ function validateDomainSeparator({
  */
 export const getNativePermit = async (
   client: Client,
-  chainId: number,
-  tokenAddress: Address,
-  spenderAddress: Address,
-  amount: bigint
+  { chainId, tokenAddress, spenderAddress, amount }: GetNativePermitParams
 ): Promise<NativePermitData | undefined> => {
   try {
     const multicallAddress = await getMulticallAddress(chainId)
@@ -179,7 +184,7 @@ export const getNativePermit = async (
     if (multicallAddress) {
       try {
         const [nameResult, domainSeparatorResult, noncesResult, versionResult] =
-          await multicall(client, {
+          await getActionWithFallback(client, multicall, 'multicall', {
             contracts: contractCalls,
             multicallAddress,
           })
@@ -229,7 +234,9 @@ export const getNativePermit = async (
 
     const [nameResult, domainSeparatorResult, noncesResult, versionResult] =
       (await Promise.allSettled(
-        contractCalls.map((call) => readContract(client, call))
+        contractCalls.map((call) =>
+          getActionWithFallback(client, readContract, 'readContract', call)
+        )
       )) as [
         PromiseSettledResult<string>,
         PromiseSettledResult<Hex>,

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

@@ -2,6 +2,7 @@ import type { ExtendedChain } from '@lifi/types'
 import type { Address, Client } from 'viem'
 import { readContract } from 'viem/actions'
 import { permit2ProxyAbi } from '../abi.js'
+import { getActionWithFallback } from '../getActionWithFallback.js'
 import type { PermitTransferFrom } from './signatureTransfer.js'
 
 export const getPermitTransferFromValues = async (
@@ -10,12 +11,17 @@ export const getPermitTransferFromValues = async (
   tokenAddress: Address,
   amount: bigint
 ): Promise<PermitTransferFrom> => {
-  const nonce = await readContract(client, {
-    address: chain.permit2Proxy as Address,
-    abi: permit2ProxyAbi,
-    functionName: 'nextNonce',
-    args: [client.account!.address],
-  })
+  const nonce = await getActionWithFallback(
+    client,
+    readContract,
+    'readContract',
+    {
+      address: chain.permit2Proxy as Address,
+      abi: permit2ProxyAbi,
+      functionName: 'nextNonce' as const,
+      args: [client.account!.address] as const,
+    }
+  )
 
   return {
     permitted: {

package/src/core/EVM/setAllowance.ts

@@ -84,7 +84,7 @@ export const setTokenAllowance = async ({
     return
   }
   const approvedAmount = await getAllowance(
-    token.chainId,
+    walletClient,
     token.address as Address,
     walletClient.account!.address,
     spenderAddress as Address
@@ -120,7 +120,7 @@ export const revokeTokenApproval = async ({
     return
   }
   const approvedAmount = await getAllowance(
-    token.chainId,
+    walletClient,
     token.address as Address,
     walletClient.account!.address,
     spenderAddress as Address

package/src/core/EVM/utils.ts

@@ -3,6 +3,7 @@ import type { Address, Chain, Client, Transaction } from 'viem'
 import { getBlock } from 'viem/actions'
 import { config } from '../../config.js'
 import { median } from '../../utils/median.js'
+import { getActionWithFallback } from './getActionWithFallback.js'
 
 type ChainBlockExplorer = {
   name: string
@@ -58,7 +59,7 @@ export function isExtendedChain(chain: any): chain is ExtendedChain {
 export const getMaxPriorityFeePerGas = async (
   client: Client
 ): Promise<bigint | undefined> => {
-  const block = await getBlock(client, {
+  const block = await getActionWithFallback(client, getBlock, 'getBlock', {
     includeTransactions: true,
   })
 

package/src/core/UTXO/getUTXOPublicClient.ts

@@ -4,7 +4,6 @@ import {
   fallback,
   publicActions,
   rpcSchema,
-  utxo,
   walletActions,
 } from '@bigmi/core'
 import type {
@@ -17,6 +16,9 @@ import type {
   UTXOSchema,
   WalletActions,
 } from '@bigmi/core'
+import { blockchair } from '@bigmi/core'
+import { blockcypher } from '@bigmi/core'
+import { mempool } from '@bigmi/core'
 import { config } from '../../config.js'
 import { getRpcUrls } from '../rpc.js'
 
@@ -61,19 +63,9 @@ export const getUTXOPublicClient = async (chainId: number) => {
       chain,
       rpcSchema: rpcSchema<UTXOSchema>(),
       transport: fallback([
-        utxo('https://api.blockchair.com', {
-          key: 'blockchair',
-          includeChainToURL: true,
-        }),
-        utxo('https://api.blockcypher.com/v1/btc/main', {
-          key: 'blockcypher',
-        }),
-        utxo('https://mempool.space/api', {
-          key: 'mempool',
-        }),
-        utxo('https://rpc.ankr.com/http/btc_blockbook/api/v2', {
-          key: 'ankr',
-        }),
+        blockchair(),
+        blockcypher(),
+        mempool(),
         ...fallbackTransports,
       ]),
       pollingInterval: 10_000,

package/src/core/execution.ts

@@ -1,5 +1,7 @@
 import type { Route } from '@lifi/types'
 import { config } from '../config.js'
+import { LiFiErrorCode } from '../errors/constants.js'
+import { ProviderError } from '../errors/errors.js'
 import { executionState } from './executionState.js'
 import { prepareRestart } from './prepareRestart.js'
 import type { ExecutionOptions, RouteExtended } from './types.js'
@@ -106,7 +108,10 @@ const executeSteps = async (route: RouteExtended): Promise<RouteExtended> => {
         .providers.find((provider) => provider.isAddress(fromAddress))
 
       if (!provider) {
-        throw new Error('SDK Execution Provider not found.')
+        throw new ProviderError(
+          LiFiErrorCode.ProviderUnavailable,
+          'SDK Execution Provider not found.'
+        )
       }
 
       const stepExecutor = await provider.getStepExecutor({

package/src/version.ts

@@ -1,2 +1,2 @@
 export const name = '@lifi/sdk'
-export const version = '3.7.1'
+export const version = '3.7.3'