@openocean.finance/widget 1.0.30 → 1.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/widget",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "Openocean Widget for cross-chain bridging and swapping. It will drive your multi-chain strategy and attract new users from everywhere.",
   "type": "module",
   "main": "./dist/esm/index.js",

package/src/config/version.ts

@@ -1,2 +1,2 @@
 export const name = '@openocean.finance/widget'
-export const version = '1.0.30'
+export const version = '1.0.32'

package/src/cross/adapters/BaseSwapAdapter.ts

@@ -15,8 +15,8 @@ import type { Quote } from '../registry.js'
 
 export enum NonEvmChain {
   Near = 'near',
-  Bitcoin = 'bitcoin',
-  Solana = 'solana',
+  Bitcoin = 20000000000001,
+  Solana = 1151111081099710,
 }
 
 export const BitcoinToken = {

package/src/cross/adapters/RelayAdapter.ts

@@ -31,7 +31,6 @@ import {
   CROSS_CHAIN_FEE_RECEIVER,
   CROSS_CHAIN_FEE_RECEIVER_SOLANA,
   MAINNET_NETWORKS,
-  type SolanaToken,
   ZERO_ADDRESS,
 } from '../constants/index.js'
 
@@ -93,7 +92,8 @@ export class RelayAdapter extends BaseSwapAdapter {
     return 'https://storage.googleapis.com/ks-setting-1d682dca/84e906bb-eaeb-45d3-a64c-2aa9c84eb3ea1747759080942.png'
   }
   getSupportedChains(): Chain[] {
-    return [NonEvmChain.Solana, ...MAINNET_NETWORKS]
+    // return [NonEvmChain.Solana, ...MAINNET_NETWORKS]
+    return [...MAINNET_NETWORKS]
   }
 
   getSupportedTokens(_sourceChain: Chain, _destChain: Chain): Currency[] {
@@ -103,24 +103,15 @@ export class RelayAdapter extends BaseSwapAdapter {
   async getQuote(params: QuoteParams): Promise<NormalizedQuote> {
     const evmFromToken = params.fromToken as Currency
     const evmToToken = params.toToken as Currency
-    const currency =
-      params.fromChain === 'solana'
-        ? (params.fromToken as SolanaToken).id
-        : evmFromToken.isNative
-          ? ZERO_ADDRESS
-          : evmFromToken.address
-
-    const toCurrency =
-      params.toChain === 'solana'
-        ? (params.toToken as SolanaToken).id
-        : evmToToken.isNative
-          ? ZERO_ADDRESS
-          : evmToToken.address
-
+    const currency = evmFromToken.isNative ? ZERO_ADDRESS : evmFromToken.address
+    const toCurrency = evmToToken.isNative ? ZERO_ADDRESS : evmToToken.address
     const resp = await getClient().actions.getQuote({
       chainId:
-        params.fromChain === 'solana' ? SolanaChainId : +params.fromChain,
-      toChainId: params.toChain === 'solana' ? SolanaChainId : +params.toChain,
+        params.fromChain === NonEvmChain.Solana
+          ? SolanaChainId
+          : +params.fromChain,
+      toChainId:
+        params.toChain === NonEvmChain.Solana ? SolanaChainId : +params.toChain,
       currency,
       toCurrency,
       amount: params.amount,
@@ -131,7 +122,10 @@ export class RelayAdapter extends BaseSwapAdapter {
       options: {
         appFees: [
           {
-            recipient: params.fromChain === 'solana' ? CROSS_CHAIN_FEE_RECEIVER_SOLANA : CROSS_CHAIN_FEE_RECEIVER,
+            recipient:
+              params.fromChain === NonEvmChain.Solana
+                ? CROSS_CHAIN_FEE_RECEIVER_SOLANA
+                : CROSS_CHAIN_FEE_RECEIVER,
             fee: params.feeBps.toString(),
           },
         ],

package/src/cross/crossChainQuote.ts

@@ -14,7 +14,7 @@ export async function getCrossChainQuote({
   inAmount,
   slippage_tolerance,
   account,
-  receiver,
+  recipient,
   tokenInUsd = 0,
   tokenOutUsd = 0,
   feeBps = 10,
@@ -27,7 +27,7 @@ export async function getCrossChainQuote({
   inAmount: string
   slippage_tolerance: string | number
   account: string
-  receiver?: string
+  recipient?: string
   tokenInUsd?: number
   tokenOutUsd?: number
   feeBps?: number
@@ -57,7 +57,7 @@ export async function getCrossChainQuote({
       tokenInUsd,
       tokenOutUsd,
       sender: account,
-      recipient: receiver || account,
+      recipient: recipient || '',
       publicKey,
     }
 
@@ -66,13 +66,12 @@ export async function getCrossChainQuote({
     }
 
     // 3. Get all quotes
-    const adapters = registry
-      .getAllAdapters()
-      .filter(
-        (adapter) =>
-          adapter.getSupportedChains().includes(params.fromChain) &&
-          adapter.getSupportedChains().includes(params.toChain)
+    const adapters = registry.getAllAdapters().filter((adapter) => {
+      return (
+        adapter.getSupportedChains().includes(params.fromChain) &&
+        adapter.getSupportedChains().includes(params.toChain)
       )
+    })
 
     if (adapters.length === 0) {
       console.warn('No supported adapters found for the specified chains')

package/src/cross/factory.ts

@@ -101,7 +101,7 @@ export class CrossChainSwapFactory {
   // Get all registered adapters
   static getAllAdapters(): SwapProvider[] {
     return [
-      // CrossChainSwapFactory.getMayanAdapter(),
+      CrossChainSwapFactory.getMayanAdapter(),
       CrossChainSwapFactory.getRelayAdapter(),
 
       // CrossChainSwapFactory.getAcrossAdapter(),

package/src/hooks/useRouteExecution.ts

@@ -46,6 +46,7 @@ export const useRouteExecution = ({
   const wagmiConfig = useConfig()
   const disconnect = useAccountDisconnect()
   const { openWalletMenu } = useWalletMenu()
+  // const { wallet: solanaWallet } = useWallet()
   const resumedAfterMount = useRef(false)
   const emitter = useWidgetEvents()
   const routeExecutionStoreContext = useRouteExecutionStoreContext()
@@ -149,6 +150,7 @@ export const useRouteExecution = ({
         wagmiConfig,
         onDisconnect: disconnect,
         onOpenWalletMenu: openWalletMenu,
+        // solanaWallet: solanaWallet?.adapter,
       })
     },
     onMutate: () => {

package/src/hooks/useRoutes.ts

@@ -1,6 +1,7 @@
 import { useAccount } from '@openocean.finance/wallet-management'
 import type { Route } from '@openocean.finance/widget-sdk'
-import { OpenOceanErrorCode } from '@openocean.finance/widget-sdk'
+import { ChainType, OpenOceanErrorCode } from '@openocean.finance/widget-sdk'
+import { useWallet } from '@solana/wallet-adapter-react'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import { parseUnits } from 'viem'
 import { useConfig } from 'wagmi'
@@ -32,18 +33,9 @@ interface RoutesProps {
 
 export const useRoutes = ({ observableRoute }: RoutesProps = {}) => {
   const wagmiConfig = useConfig()
+  const { wallet: solanaWallet } = useWallet()
 
-  const {
-    subvariant,
-    sdkConfig,
-    contractTool,
-    bridges,
-    exchanges,
-    fee,
-    feeConfig,
-    useRelayerRoutes,
-    referrer,
-  } = useWidgetConfig()
+  const { subvariant, sdkConfig, fee, feeConfig, referrer } = useWidgetConfig()
   const setExecutableRoute = useSetExecutableRoute()
   const queryClient = useQueryClient()
   const emitter = useWidgetEvents()
@@ -215,8 +207,22 @@ export const useRoutes = ({ observableRoute }: RoutesProps = {}) => {
                 chainId: toChainId,
               }
 
-              const walletClient = await getWalletClient(wagmiConfig)
-
+              // Get appropriate wallet client based on chain type
+              let walletClient = undefined
+              if (fromChain?.chainType === ChainType.EVM) {
+                try {
+                  walletClient = await getWalletClient(wagmiConfig)
+                } catch (error) {
+                  console.warn(
+                    'Failed to get wallet client for EVM chain:',
+                    error
+                  )
+                  // Continue without walletClient for non-EVM chains
+                }
+              } else if (fromChain?.chainType === ChainType.SVM) {
+                // For Solana chains, use the Solana wallet adapter
+                walletClient = solanaWallet?.adapter
+              }
               quoteResult = await getCrossChainQuote({
                 feeBps: 10,
                 fromMsg,
@@ -225,6 +231,7 @@ export const useRoutes = ({ observableRoute }: RoutesProps = {}) => {
                 slippage_tolerance: formattedSlippage,
                 account: account?.address || '',
                 walletClient,
+                recipient: toAddress || '',
               })
 
               // quoteResult = await DebridgeService.swapUThenCross({
@@ -281,6 +288,10 @@ export const useRoutes = ({ observableRoute }: RoutesProps = {}) => {
               quoteResult.isBridge = false
             }
           }
+          if (!quoteResult) {
+            return []
+          }
+          // biome-ignore lint/complexity/useOptionalChain: <explanation>
           const data = (quoteResult && quoteResult.data) || {}
           // minOutAmount calculation is now handled within DebridgeService or OpenOceanService
           const isBridge = quoteResult.isBridge
@@ -355,7 +366,7 @@ export const useRoutes = ({ observableRoute }: RoutesProps = {}) => {
                   fromAmount: fromAmount.toString(),
                   toAmount: data?.outAmount || '0',
                   toAmountMin,
-                  approvalAddress: data?.approveContract || '0x0',
+                  approvalAddress: data?.approveContract || data?.to || '0x0',
                   executionDuration:
                     data?.executionDuration ||
                     Math.floor(Math.random() * 20) + 40,

package/src/services/ExecuteRoute.ts

@@ -248,6 +248,7 @@ interface ExecuteRouteOptions {
   wagmiConfig: any // Use any to avoid deep type instantiation
   onDisconnect?: (account: Account) => Promise<void>
   onOpenWalletMenu?: () => void
+  solanaWallet?: any
 }
 
 interface ExtendedOpenOceanStep extends OpenOceanStep {
@@ -274,7 +275,8 @@ async function executeSolanaSwap(
   step: ExtendedOpenOceanStep,
   options: ExecuteRouteOptions,
   process: Process,
-  route: ExtendedRoute
+  route: ExtendedRoute,
+  solanaWallet?: any
 ): Promise<void> {
   try {
     // Check wallet connection status
@@ -286,63 +288,78 @@ async function executeSolanaSwap(
     const connection = new Connection(
       'https://burned-practical-bird.solana-mainnet.quiknode.pro/33f4786133c252415e194b29ee69ffc7671480ab'
     )
-    const txData: any = step.transactionRequest?.data || ''
-    const dexId = step.transactionRequest?.type || 0
-    if (step.action.fromChainId === step.action.toChainId) {
-      if (dexId === 6 || dexId === 7 || dexId === 9) {
-        transaction = VersionedTransaction.deserialize(hexToUint8Array(txData))
-      } else {
-        transaction = Transaction.from(hexToUint8Array(txData))
-      }
+    const { transactionRequest, type, quoteData } = step || {}
+    if ((type as any) === 'bridge') {
+      const result = await bridgeExecuteSwap({
+        quoteData: quoteData,
+        walletClient: solanaWallet,
+      })
+      const hash = result.sourceTxHash
+      process.status = 'PENDING'
+      process.txHash = hash
+      process.message = 'Transaction pending'
+      options.updateRouteHook?.(route)
     } else {
-      transaction = VersionedTransaction.deserialize(
-        hexToUint8Array(txData.slice(2))
-      )
+      const txData: any = transactionRequest?.data || ''
+      const dexId = transactionRequest?.type || 0
+      if (step.action.fromChainId === step.action.toChainId) {
+        if (dexId === 6 || dexId === 7 || dexId === 9) {
+          transaction = VersionedTransaction.deserialize(
+            hexToUint8Array(txData)
+          )
+        } else {
+          transaction = Transaction.from(hexToUint8Array(txData))
+        }
+      } else {
+        transaction = VersionedTransaction.deserialize(
+          hexToUint8Array(txData.slice(2))
+        )
 
-      const { blockhash } = await connection.getLatestBlockhash()
-      transaction.message.recentBlockhash = blockhash
-    }
+        const { blockhash } = await connection.getLatestBlockhash()
+        transaction.message.recentBlockhash = blockhash
+      }
 
-    // Check signTransaction method exists
-    const connector = options.account.connector as any
-    if (typeof connector.signTransaction !== 'function') {
-      throw new Error('Wallet does not support transaction signing')
-    }
+      // Check signTransaction method exists
+      const connector = options.account.connector as any
+      if (typeof connector.signTransaction !== 'function') {
+        throw new Error('Wallet does not support transaction signing')
+      }
 
-    // Sign transaction
-    const signedTx = await connector.signTransaction(transaction)
-    if (!signedTx) {
-      throw new Error('Failed to sign transaction')
-    }
+      // Sign transaction
+      const signedTx = await connector.signTransaction(transaction)
+      if (!signedTx) {
+        throw new Error('Failed to sign transaction')
+      }
 
-    // Serialize signed transaction
-    const serializedTransaction = signedTx.serialize({
-      verifySignatures: false,
-      requireAllSignatures: false,
-    })
+      // Serialize signed transaction
+      const serializedTransaction = signedTx.serialize({
+        verifySignatures: false,
+        requireAllSignatures: false,
+      })
 
-    // Use improved transaction sender
-    await sendAndConfirmSolanaTransaction({
-      connection,
-      serializedTransaction,
-      process,
-      updateRouteHook: (updatedProcess) => {
-        // Update process status
-        Object.assign(process, updatedProcess)
-
-        // Update step execution status
-        if (process.status === 'DONE') {
-          step.execution!.status = 'DONE'
-        } else if (process.status === 'FAILED') {
-          step.execution!.status = 'FAILED'
-        } else {
-          step.execution!.status = 'PENDING'
-        }
+      // Use improved transaction sender
+      await sendAndConfirmSolanaTransaction({
+        connection,
+        serializedTransaction,
+        process,
+        updateRouteHook: (updatedProcess) => {
+          // Update process status
+          Object.assign(process, updatedProcess)
+
+          // Update step execution status
+          if (process.status === 'DONE') {
+            step.execution!.status = 'DONE'
+          } else if (process.status === 'FAILED') {
+            step.execution!.status = 'FAILED'
+          } else {
+            step.execution!.status = 'PENDING'
+          }
 
-        // Call original updateRouteHook
-        options.updateRouteHook?.(route)
-      },
-    })
+          // Call original updateRouteHook
+          options.updateRouteHook?.(route)
+        },
+      })
+    }
   } catch (error) {
     console.error('Solana swap execution failed:', error)
     process.status = 'FAILED'
@@ -616,7 +633,8 @@ async function executeEvmSwap(
 // Execute transaction
 async function executeSwap(
   route: ExtendedRoute,
-  options: ExecuteRouteOptions
+  options: ExecuteRouteOptions,
+  solanaWallet?: any
 ): Promise<Route> {
   const updatedRoute = { ...route }
 
@@ -655,7 +673,13 @@ async function executeSwap(
       // Execute different transaction logic based on chain type
       const currentStep = route.steps[0]
       if (currentStep.action?.fromChainId === 1151111081099710) {
-        await executeSolanaSwap(currentStep, options, process, updatedRoute)
+        await executeSolanaSwap(
+          currentStep,
+          options,
+          process,
+          updatedRoute,
+          solanaWallet
+        )
       } else {
         await executeEvmSwap(currentStep, options, process, updatedRoute)
       }
@@ -688,5 +712,5 @@ export async function executeRoute(
     throw new Error('Wallet not connected')
   }
 
-  return executeSwap(route as ExtendedRoute, options)
+  return executeSwap(route as ExtendedRoute, options, options.solanaWallet)
 }