@lifi/sdk 3.0.0-alpha.55 → 3.0.0-alpha.57

package/src/core/EVM/publicClient.ts

@@ -1,6 +1,7 @@
+import { ChainId } from '@lifi/types'
 import type { PublicClient } from 'viem'
 import { createPublicClient, fallback, http } from 'viem'
-import type { Chain } from 'viem/chains'
+import { mainnet, type Chain } from 'viem/chains'
 import { config } from '../../config.js'
 import { getRpcUrls } from '../rpc.js'
 
@@ -32,6 +33,13 @@ export const getPublicClient = async (
         public: { http: _chain.metamask.rpcUrls },
       },
     }
+    // Add ENS contracts
+    if (chain.id === ChainId.ETH) {
+      chain.contracts = {
+        ...mainnet.contracts,
+        ...chain.contracts,
+      }
+    }
     publicClients[chainId] = createPublicClient({
       chain: chain,
       transport: fallback(fallbackTransports),

package/src/core/EVM/utils.ts

@@ -42,8 +42,7 @@ export const getMulticallAddress = async (
 }
 
 // Modified viem retryDelay exponential backoff function.
-// Together with adjusted retryCount gives us 25 seconds to wait for the block or transaction.
 export const retryDelay = ({ count }: { count: number; error: Error }) =>
-  Math.min(~~(1 << count) * 200, 2000)
+  Math.min(~~(1 << count) * 200, 3000)
 
-export const retryCount = 15
+export const retryCount = 20

package/src/core/Solana/Solana.ts

@@ -1,8 +1,9 @@
 import { ChainType } from '@lifi/types'
-import { PublicKey } from '@solana/web3.js'
 import type { StepExecutorOptions } from '../types.js'
 import { SolanaStepExecutor } from './SolanaStepExecutor.js'
+import { getSNSAddress } from './getSNSAddress.js'
 import { getSolanaBalance } from './getSolanaBalance.js'
+import { isAddress } from './isAddress.js'
 import type { SolanaProvider, SolanaProviderOptions } from './types.js'
 
 export function Solana(options?: SolanaProviderOptions): SolanaProvider {
@@ -11,14 +12,8 @@ export function Solana(options?: SolanaProviderOptions): SolanaProvider {
     get type() {
       return ChainType.SVM
     },
-    isAddress(address: string): boolean {
-      try {
-        new PublicKey(address)
-        return true
-      } catch (error) {
-        return false
-      }
-    },
+    isAddress,
+    resolveAddress: getSNSAddress,
     getBalance: getSolanaBalance,
     async getStepExecutor(
       options: StepExecutorOptions

package/src/core/Solana/getSNSAddress.ts

@@ -0,0 +1,33 @@
+import { isAddress } from './isAddress.js'
+
+interface SNSResult {
+  s: 'ok' | 'error'
+  result: string
+}
+
+// Subject to change
+// https://github.com/Bonfida/sns-sdk?tab=readme-ov-file#sdk-proxy
+export const getSNSAddress = async (name: string) => {
+  try {
+    if (!name.endsWith('.sol')) {
+      return
+    }
+    // const rpcUrl = await getRpcUrl(ChainId.SOL)
+    const snsWorkerUrl = `https://sns-sdk-proxy.bonfida.workers.dev/resolve/${name}`
+    const response: Response = await fetch(snsWorkerUrl)
+    if (!response.ok) {
+      return
+    }
+
+    const data: SNSResult = await response.json()
+
+    if (!isAddress(data.result)) {
+      return
+    }
+
+    return data.result
+  } catch (_) {
+    // ignore
+    return
+  }
+}

package/src/core/Solana/isAddress.ts

@@ -0,0 +1,10 @@
+import { PublicKey } from '@solana/web3.js'
+
+export function isAddress(address: string): boolean {
+  try {
+    new PublicKey(address)
+    return true
+  } catch (error) {
+    return false
+  }
+}

package/src/core/types.ts

@@ -12,6 +12,7 @@ import type { WalletClient } from 'viem'
 export interface SDKProvider {
   readonly type: ChainType
   isAddress(address: string): boolean
+  resolveAddress(name: string): Promise<string | undefined>
   getStepExecutor(options: StepExecutorOptions): Promise<StepExecutor>
   getBalance(walletAddress: string, tokens: Token[]): Promise<TokenAmount[]>
 }

package/src/core/waitForReceivingTransaction.ts

@@ -23,10 +23,10 @@ export async function waitForReceivingTransaction(
       let statusResponse: StatusResponse
       try {
         statusResponse = await getStatus({
-          bridge: step.tool,
           fromChain: step.action.fromChainId,
           toChain: step.action.toChainId,
           txHash,
+          ...(step.tool !== 'custom' && { bridge: step.tool }),
         })
       } catch (e: any) {
         console.debug('Fetching status from backend failed.', e)

package/src/index.ts

@@ -12,6 +12,7 @@ export { createConfig } from './createConfig.js'
 export * from './helpers.js'
 export * from './services/api.js'
 export * from './services/balance.js'
+export * from './services/getNameServiceAddress.js'
 export * from './types/index.js'
 export * from './utils/errors.js'
 export { LiFiError, type ErrorCode } from './utils/errors.js'

package/src/services/api.ts

@@ -5,7 +5,7 @@ import type {
   ChainsResponse,
   ConnectionsRequest,
   ConnectionsResponse,
-  ContractCallQuoteRequest,
+  ContractCallsQuoteRequest,
   ExtendedChain,
   GasRecommendationRequest,
   GasRecommendationResponse,
@@ -132,21 +132,19 @@ export const getQuote = async (
  * @throws {LiFiError} - Throws a LiFiError if request fails
  * @returns - Returns step.
  */
-export const getContractCallQuote = async (
-  params: ContractCallQuoteRequest,
+export const getContractCallsQuote = async (
+  params: ContractCallsQuoteRequest,
   options?: RequestOptions
 ): Promise<LiFiStep> => {
   // validation
-  const requiredParameters: Array<keyof ContractCallQuoteRequest> = [
+  const requiredParameters: Array<keyof ContractCallsQuoteRequest> = [
     'fromChain',
     'fromToken',
     'fromAddress',
     'toChain',
     'toToken',
     'toAmount',
-    'toContractAddress',
-    'toContractCallData',
-    'toContractGasLimit',
+    'contractCalls',
   ]
   requiredParameters.forEach((requiredParameter) => {
     if (!params[requiredParameter]) {
@@ -171,7 +169,7 @@ export const getContractCallQuote = async (
   // send request
   try {
     const response = await request<LiFiStep>(
-      `${_config.apiUrl}/quote/contractCall`,
+      `${_config.apiUrl}/quote/contractCalls`,
       {
         method: 'POST',
         headers: {

package/src/services/getNameServiceAddress.ts

@@ -0,0 +1,30 @@
+import type { ChainType } from '@lifi/types'
+import { config } from '../config.js'
+
+export const getNameServiceAddress = async (
+  name: string,
+  chainType?: ChainType
+): Promise<string | undefined> => {
+  try {
+    let providers = config.get().providers
+    if (chainType) {
+      providers = providers.filter((provider) => provider.type === chainType)
+    }
+    const resolvers = providers.map((provider) => provider.resolveAddress)
+    if (!resolvers.length) {
+      return
+    }
+    const result = await Promise.any(
+      resolvers.map(async (resolve) => {
+        const address = await resolve(name)
+        if (!address) {
+          throw undefined
+        }
+        return address
+      })
+    )
+    return result
+  } catch (_) {
+    return
+  }
+}

package/src/version.ts

@@ -1,2 +1,2 @@
 export const name = '@lifi/sdk'
-export const version = '3.0.0-alpha.55'
+export const version = '3.0.0-alpha.57'