@openocean.finance/widget 1.0.41 → 1.0.44

package/src/cross/adapters/OrbiterAdapter.ts

@@ -3,7 +3,7 @@ import { Currency } from '../constants/index.js'
 import { useWalletSelector } from '@near-wallet-selector/react-hook'
 import { WalletAdapterProps } from '@solana/wallet-adapter-base'
 import { Connection, Transaction, VersionedTransaction } from '@solana/web3.js'
-import { getPublicClient } from '@wagmi/core'
+import { getPublicClient } from 'wagmi/actions'
 import { WalletClient, formatUnits } from 'viem'
 import { useConfig } from 'wagmi'
 import { CROSS_CHAIN_FEE_RECEIVER, CROSS_CHAIN_FEE_RECEIVER_SOLANA, ZERO_ADDRESS } from '../constants/index.js'
@@ -53,27 +53,27 @@ export class OrbiterAdapter extends BaseSwapAdapter {
     const fromToken = params.fromToken as any
     const toToken = params.toToken as any
     const body = {
-      sourceChainId: params.fromChain === 'solana' ? 'SOLANA_MAIN' : params.fromChain.toString(),
-      destChainId: params.toChain === 'solana' ? 'SOLANA_MAIN' : params.toChain.toString(),
+      sourceChainId: params.fromChain === 1151111081099710 ? 'SOLANA_MAIN' : params.fromChain.toString(),
+      destChainId: params.toChain === 1151111081099710 ? 'SOLANA_MAIN' : params.toChain.toString(),
       sourceToken:
-        params.fromChain === 'solana'
+        params.fromChain === 1151111081099710
           ? (params.fromToken as SolanaToken).id
           : fromToken.isNative
-          ? ZERO_ADDRESS
-          : fromToken.address,
+            ? ZERO_ADDRESS
+            : fromToken.address,
 
       destToken:
-        params.toChain === 'solana'
+        params.toChain === 1151111081099710
           ? (params.toToken as SolanaToken).id
           : toToken.isNative
-          ? ZERO_ADDRESS
-          : toToken.address,
+            ? ZERO_ADDRESS
+            : toToken.address,
       amount: params.amount.toString(),
       userAddress: params.sender,
       targetRecipient: params.recipient,
       slippage: params.slippage / 10_000,
       feeConfig: {
-        feeRecipient: params.fromChain === 'solana' ? CROSS_CHAIN_FEE_RECEIVER_SOLANA : CROSS_CHAIN_FEE_RECEIVER,
+        feeRecipient: params.fromChain === 1151111081099710 ? CROSS_CHAIN_FEE_RECEIVER_SOLANA : CROSS_CHAIN_FEE_RECEIVER,
         feePercent: (params.feeBps / 10000).toString(),
       },
       channel: 'kyberswap',
@@ -127,7 +127,7 @@ export class OrbiterAdapter extends BaseSwapAdapter {
     sendSolanaFn?: WalletAdapterProps['sendTransaction'],
     solanaConnection?: Connection,
   ): Promise<NormalizedTxResponse> {
-    if (quote.quoteParams.fromChain === 'solana') {
+    if (quote.quoteParams.fromChain === 1151111081099710) {
       if (!solanaConnection || !sendSolanaFn) throw new Error('Connection is not defined for Solana swap')
       const encodedData = quote.rawQuote.steps?.[0]?.tx?.data
       const txBuffer = Buffer.from(encodedData, 'base64')
@@ -214,6 +214,7 @@ export class OrbiterAdapter extends BaseSwapAdapter {
           to: step.tx.to as `0x${string}`,
           value: BigInt(step.tx.value),
           data: step.tx.data as `0x${string}`,
+          kzg: undefined,
         })
         return tx
       }),
@@ -237,7 +238,7 @@ export class OrbiterAdapter extends BaseSwapAdapter {
   }
 
   async getTransactionStatus(p: NormalizedTxResponse): Promise<SwapStatus> {
-    if (p.sourceChain !== 'solana') {
+    if (p.sourceChain !== 1151111081099710) {
       const publicClient = getPublicClient(useConfig(), {
         chainId: p.sourceChain as any,
       })
@@ -261,10 +262,10 @@ export class OrbiterAdapter extends BaseSwapAdapter {
         res.result.opStatus === -1
           ? 'Failed'
           : res.result.opStatus === 80
-          ? 'Refunded'
-          : res.result.opStatus !== 98 && res.result.opStatus !== 99
-          ? 'Processing'
-          : 'Success',
+            ? 'Refunded'
+            : res.result.opStatus !== 98 && res.result.opStatus !== 99
+              ? 'Processing'
+              : 'Success',
     }
   }
 }

package/src/cross/adapters/RelayAdapter.ts

@@ -4,7 +4,8 @@ import {
   convertViemChainToRelayChain,
   createClient,
   getClient,
-} from '@reservoir0x/relay-sdk'
+  type QuoteBodyOptions,
+} from '@relayprotocol/relay-sdk'
 import { type WalletClient, formatUnits } from 'viem'
 import {
   arbitrum,
@@ -24,6 +25,7 @@ import {
   sonic,
   unichain,
   zksync,
+  celo
 } from 'viem/chains'
 import type { Currency } from '../constants/index.js'
 
@@ -39,6 +41,7 @@ import {
   type Chain,
   NOT_SUPPORTED_CHAINS_PRICE_SERVICE,
   NonEvmChain,
+  NewEvmChain,
   type NormalizedQuote,
   type NormalizedTxResponse,
   type QuoteParams,
@@ -99,6 +102,9 @@ const plasma = defineChain({
 
 
 const SolanaChainId = 792703809
+const BitcoinChainId = 8253038
+const BitcoinAddress = 'bc1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqmql8k8'
+const MonadChainId = 143
 
 const solanaChain = {
   id: SolanaChainId,
@@ -107,6 +113,21 @@ const solanaChain = {
   vmType: 'svm' as const,
 } as RelayChain
 
+const bitcoinChain = {
+  id: BitcoinChainId,
+  name: 'Bitcoin',
+  displayName: 'Bitcoin',
+  vmType: 'bvm' as const,
+} as RelayChain
+
+
+const MonadChain = {
+  id: MonadChainId,
+  name: 'Monad',
+  displayName: 'Monad',
+  vmType: 'evm' as const,
+} as RelayChain
+
 export class RelayAdapter extends BaseSwapAdapter {
   constructor() {
     super()
@@ -132,10 +153,11 @@ export class RelayAdapter extends BaseSwapAdapter {
         ronin,
         unichain,
         hyperEvm,
-        plasma
+        plasma,
+        celo,
       ]
         .map(convertViemChainToRelayChain)
-        .concat(solanaChain as any),
+        .concat(solanaChain as any, bitcoinChain as any, MonadChain as any),
     })
   }
 
@@ -146,7 +168,7 @@ export class RelayAdapter extends BaseSwapAdapter {
     return 'https://storage.googleapis.com/ks-setting-1d682dca/84e906bb-eaeb-45d3-a64c-2aa9c84eb3ea1747759080942.png'
   }
   getSupportedChains(): Chain[] {
-    return [NonEvmChain.Solana, NonEvmChain.Plasma, ...MAINNET_NETWORKS]
+    return [NonEvmChain.Solana, NonEvmChain.Bitcoin, NewEvmChain.Plasma, NewEvmChain.Monad, ...MAINNET_NETWORKS]
     // return [...MAINNET_NETWORKS]
   }
 
@@ -157,19 +179,30 @@ 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 = evmFromToken.isNative ? ZERO_ADDRESS : evmFromToken.address
-    const toCurrency = evmToToken.isNative ? ZERO_ADDRESS : evmToToken.address
-    const resp = await getClient().actions.getQuote({
-      chainId:
-        params.fromChain === NonEvmChain.Solana
-          ? SolanaChainId
-          : +params.fromChain,
-      toChainId:
-        params.toChain === NonEvmChain.Solana ? SolanaChainId : +params.toChain,
+    let currency = evmFromToken.isNative ? ZERO_ADDRESS : evmFromToken.address
+    let toCurrency = evmToToken.isNative ? ZERO_ADDRESS : evmToToken.address
+
+    let chainId = +params.fromChain
+    if (params.fromChain === NonEvmChain.Solana) {
+      chainId = SolanaChainId
+    } else if (params.fromChain === NonEvmChain.Bitcoin) {
+      chainId = BitcoinChainId
+      currency = BitcoinAddress
+    }
+    let toChainId = +params.toChain
+    if (params.toChain === NonEvmChain.Solana) {
+      toChainId = SolanaChainId
+    } else if (params.toChain === NonEvmChain.Bitcoin) {
+      toChainId = BitcoinChainId
+      toCurrency = BitcoinAddress
+    }
+    const quoteParams = {
+      chainId: chainId,
+      toChainId: toChainId,
       currency,
       toCurrency,
       amount: params.amount,
-      tradeType: 'EXACT_INPUT',
+      tradeType: 'EXACT_INPUT' as QuoteBodyOptions['tradeType'],
       wallet: params.walletClient,
       recipient: params.recipient,
       user: params.sender,
@@ -184,11 +217,11 @@ export class RelayAdapter extends BaseSwapAdapter {
             fee: params.feeBps.toString(),
           },
         ],
-        protocolVersion:'preferV2'
+        protocolVersion: 'preferV2' as 'preferV2' | 'v1' | 'v2',
         // includedSwapSources: ['open-ocean'],
       },
-    })
-
+    }
+    const resp = await getClient().actions.getQuote(quoteParams)
     const formattedOutputAmount = formatUnits(
       BigInt(resp.details?.currencyOut?.amount || '0'),
       params.toToken.decimals

package/src/cross/adapters/SymbiosisAdapter.ts

@@ -30,20 +30,18 @@ export class SymbiosisAdapter extends BaseSwapAdapter {
   }
   getSupportedChains(): Chain[] {
     return [
-      ChainId.MAINNET,
-      ChainId.BSCMAINNET,
-      ChainId.MATIC,
-      ChainId.AVAXMAINNET,
-      ChainId.ZKSYNC,
-      ChainId.ARBITRUM,
-      ChainId.OPTIMISM,
-      ChainId.LINEA,
-      ChainId.MANTLE,
-      ChainId.BASE,
-      ChainId.SCROLL,
-      ChainId.BLAST,
-      ChainId.SONIC,
-      ChainId.BERA,
+      ChainId.ETH,
+      ChainId.BAS,
+      ChainId.POL,
+      ChainId.AVA,
+      // ChainId.ZKSYNC,
+      ChainId.ARB,
+      ChainId.OPT,
+      ChainId.LNA,
+      ChainId.BAS,
+      ChainId.SCL,
+      ChainId.BLS,
+      ChainId.UNI,
     ]
   }
 
@@ -118,6 +116,7 @@ export class SymbiosisAdapter extends BaseSwapAdapter {
       to: quote.rawQuote.tx.to,
       value: BigInt(quote.rawQuote.tx.value),
       data: quote.rawQuote.tx.data,
+      kzg: undefined,
     })
     return {
       sender: quote.quoteParams.sender,

package/src/cross/adapters/XYFinanceAdapter.ts

@@ -1,6 +1,6 @@
 import { ChainId } from '@openocean.finance/widget-sdk'
 import { Currency } from '../constants/index.js'
-import { getPublicClient } from '@wagmi/core'
+import { getPublicClient } from 'wagmi/actions'
 import { WalletClient, formatUnits } from 'viem'
 import { useConfig } from 'wagmi'
 
@@ -32,22 +32,17 @@ export class XYFinanceAdapter extends BaseSwapAdapter {
   }
   getSupportedChains(): Chain[] {
     return [
-      ChainId.MAINNET,
-      ChainId.BSCMAINNET,
-      ChainId.MATIC,
-      ChainId.FANTOM,
-      ChainId.AVAXMAINNET,
-      ChainId.ARBITRUM,
-      ChainId.OPTIMISM,
-      ChainId.ZKSYNC,
-      ChainId.LINEA,
-      ChainId.BASE,
-      ChainId.MANTLE,
-      ChainId.SCROLL,
-      ChainId.BLAST,
-      ChainId.BERA,
-      ChainId.SONIC,
-      ChainId.UNICHAIN,
+      ChainId.ETH,
+      ChainId.BSC,
+      ChainId.POL,
+      ChainId.AVA,
+      ChainId.ARB,
+      ChainId.OPT,
+      ChainId.LNA,
+      ChainId.BAS,
+      ChainId.SCL,
+      ChainId.BLS,
+      ChainId.UNI,
     ]
   }
 
@@ -145,8 +140,8 @@ export class XYFinanceAdapter extends BaseSwapAdapter {
       ...(quote.rawQuote.srcSwapDescription ? { srcSwapProvider: quote.rawQuote.srcSwapDescription.provider } : {}),
       ...(quote.rawQuote.dstSwapDescription
         ? {
-            dstSwapProvider: quote.rawQuote.dstSwapDescription?.provider,
-          }
+          dstSwapProvider: quote.rawQuote.dstSwapDescription?.provider,
+        }
         : {}),
     }
 
@@ -168,6 +163,7 @@ export class XYFinanceAdapter extends BaseSwapAdapter {
         to: resp.tx.to,
         value: resp.tx.value,
         data: resp.tx.data,
+        kzg: undefined,
       })
       return {
         sender: quote.quoteParams.sender,

package/src/cross/adapters/index.ts

@@ -1,4 +1,4 @@
-// export * from './BaseSwapAdapter.js'
+export * from './BaseSwapAdapter.js'
 // export * from './AcrossAdapter.js'
 export * from './RelayAdapter.js'
 // export * from './XYFinanceAdapter.js'
@@ -7,3 +7,4 @@ export * from './MayanAdapter.js'
 // export * from './DebridgeAdapter.js'
 // export * from './LifiAdapter.js'
 // export * from './KyberSwapAdapter.js'
+export * from './NearIntentsAdapter.js'

package/src/cross/constants/index.ts

@@ -183,6 +183,8 @@ export const MAINNET_NETWORKS = [
   ChainId.UNI,
   ChainId.BLS,
   ChainId.SCL,
+  ChainId.CEL,
+  ChainId.MONAD,
 ] as const
 
 export interface Currency {
@@ -203,6 +205,7 @@ export interface Currency {
 }
 
 export interface NearToken {
+  address: string
   assetId: string
   decimals: number
   blockchain: string
@@ -214,6 +217,7 @@ export interface NearToken {
 }
 
 export interface SolanaToken {
+  address: string
   id: string
   name: string
   symbol: string

package/src/cross/crossChainQuote.ts

@@ -41,6 +41,11 @@ export async function getCrossChainQuote({
     CrossChainSwapFactory.getAllAdapters().forEach((adapter) => {
       registry.registerAdapter(adapter)
     })
+
+    let slippage = typeof slippage_tolerance === 'string'
+      ? Number.parseFloat(slippage_tolerance)
+      : slippage_tolerance
+    slippage = Math.floor(slippage * 10000) / 100
     // 2. Construct QuoteParams
     const params: QuoteParams = {
       feeBps,
@@ -49,20 +54,18 @@ export async function getCrossChainQuote({
       fromToken: fromMsg,
       toToken: toMsg,
       amount: inAmount,
-      slippage:
-        typeof slippage_tolerance === 'string'
-          ? Number.parseFloat(slippage_tolerance)
-          : slippage_tolerance,
+      slippage: slippage,
       walletClient,
       tokenInUsd,
       tokenOutUsd,
       sender: account,
       recipient: recipient || '',
       publicKey,
+      isNative: fromMsg.isNative || toMsg.isNative,
     }
 
     if (fromMsg.chainId === 'near' || toMsg.chainId === 'near') {
-      ;(params as any).nearTokens = nearTokens
+      ; (params as any).nearTokens = nearTokens
     }
 
     // 3. Get all quotes
@@ -72,14 +75,13 @@ export async function getCrossChainQuote({
         adapter.getSupportedChains().includes(params.toChain)
       )
     })
-
     if (adapters.length === 0) {
       console.warn('No supported adapters found for the specified chains')
       return null
     }
 
     const quoteResults: Quote[] = []
-
+    let errorMsg = ''
     // Get quotes from all adapters in parallel
     const quotePromises = adapters.map(async (adapter) => {
       try {
@@ -88,6 +90,7 @@ export async function getCrossChainQuote({
           quoteResults.push({ adapter, quote })
         }
       } catch (error) {
+        errorMsg = error instanceof Error ? error.message : 'Unknown error'
         // Ignore individual adapter errors, continue getting quotes from other adapters
         console.warn(`Failed to get quote from ${adapter.getName()}:`, error)
       }
@@ -97,7 +100,8 @@ export async function getCrossChainQuote({
 
     if (quoteResults.length === 0) {
       console.warn('No valid quotes found from any adapter')
-      return null
+      throw new Error(errorMsg)
+      // return { error: errorMsg }
     }
 
     // 4. Select best quote (highest outputAmount)
@@ -106,7 +110,6 @@ export async function getCrossChainQuote({
     )
 
     const best = quoteResults[0]
-
     // 5. Construct return structure compatible with useRoutes.ts
     return {
       data: {
@@ -114,8 +117,8 @@ export async function getCrossChainQuote({
         outAmount: best.quote.outputAmount || '0',
         fromTokenUSD: best.quote.inputUsd?.toString() || '0',
         toTokenUSD: best.quote.outputUsd?.toString() || '0',
-        quoteAdapterName: best.adapter.getName(),
-        quoteAdapterKey: best.adapter.getName().toLowerCase(),
+        quoteAdapterName: best.adapter?.getName() || '',
+        quoteAdapterKey: best.adapter?.getName()?.toLowerCase() || '',
         chainId: fromMsg.chainId,
         from: account,
 
@@ -130,7 +133,7 @@ export async function getCrossChainQuote({
         // Fee information
         feeCosts: [
           {
-            name: `${best.adapter.getName()} Fee`,
+            name: `${best.adapter?.getName() || ''} Fee`,
             description: 'Protocol fee',
             token: fromMsg,
             amount: '0',
@@ -145,7 +148,7 @@ export async function getCrossChainQuote({
     }
   } catch (error) {
     console.error('Error getting cross-chain quote:', error)
-    return null
+    throw error
   }
 }
 
@@ -158,14 +161,17 @@ export const bridgeExecuteSwap = async ({
 }) => {
   const adapterName = quoteData.quoteAdapterKey
   const adapter = CrossChainSwapFactory.getAdapterByName(adapterName)
-  const result = await adapter.executeSwap(
-    {
-      quote: quoteData.quoteRawData,
-    },
-    walletClient
-  )
-
-  return result
+  if (adapter) {
+    const result = await adapter?.executeSwap(
+      {
+        adapter,
+        quote: quoteData.quoteRawData as any,
+      },
+      walletClient
+    )
+    return result
+  }
+  return null
 }
 
 // Login URL mapping for each adapter

package/src/cross/factory.ts

@@ -1,4 +1,3 @@
-// import { NearIntentsAdapter } from './adapters/NearIntentsAdapter.js'
 // import { OptimexAdapter } from './adapters/OptimexAdapter.js'
 // import { OrbiterAdapter } from './adapters/OrbiterAdapter.js'
 import {
@@ -7,7 +6,8 @@ import {
   // LifiAdapter,
   MayanAdapter,
   RelayAdapter,
-  // SwapProvider,
+  NearIntentsAdapter,
+  SwapProvider,
   // SymbiosisAdapter,
   // XYFinanceAdapter,
 } from './adapters/index.js'
@@ -18,7 +18,7 @@ export class CrossChainSwapFactory {
   // private static acrossInstance: AcrossAdapter
   private static relayInstance: RelayAdapter
   // private static xyFinanceInstance: XYFinanceAdapter
-  // private static nearIntentsInstance: NearIntentsAdapter
+  private static nearIntentsInstance: NearIntentsAdapter
   private static mayanInstance: MayanAdapter
   // private static symbiosisInstance: SymbiosisAdapter
   // private static debridgeInstance: DeBridgeAdapter
@@ -49,12 +49,12 @@ export class CrossChainSwapFactory {
   //   return CrossChainSwapFactory.xyFinanceInstance
   // }
 
-  // static getNearIntentsAdapter(): NearIntentsAdapter {
-  //   if (!CrossChainSwapFactory.nearIntentsInstance) {
-  //     CrossChainSwapFactory.nearIntentsInstance = new NearIntentsAdapter()
-  //   }
-  //   return CrossChainSwapFactory.nearIntentsInstance
-  // }
+  static getNearIntentsAdapter(): NearIntentsAdapter {
+    if (!CrossChainSwapFactory.nearIntentsInstance) {
+      CrossChainSwapFactory.nearIntentsInstance = new NearIntentsAdapter()
+    }
+    return CrossChainSwapFactory.nearIntentsInstance
+  }
 
   static getMayanAdapter(): MayanAdapter {
     if (!CrossChainSwapFactory.mayanInstance) {
@@ -103,10 +103,10 @@ export class CrossChainSwapFactory {
     return [
       CrossChainSwapFactory.getMayanAdapter(),
       CrossChainSwapFactory.getRelayAdapter(),
+      CrossChainSwapFactory.getNearIntentsAdapter(),
 
       // CrossChainSwapFactory.getAcrossAdapter(),
       // CrossChainSwapFactory.getXyFinanceAdapter(),
-      // CrossChainSwapFactory.getNearIntentsAdapter(),
       // CrossChainSwapFactory.getSymbiosisAdapter(),
       // CrossChainSwapFactory.getDebridgeInstance(),
       // CrossChainSwapFactory.getLifiInstance(),
@@ -124,8 +124,8 @@ export class CrossChainSwapFactory {
         return CrossChainSwapFactory.getRelayAdapter()
       // case 'xyfinance':
       //   return CrossChainSwapFactory.getXyFinanceAdapter()
-      // case 'near intents':
-      //   return CrossChainSwapFactory.getNearIntentsAdapter()
+      case 'near intents':
+        return CrossChainSwapFactory.getNearIntentsAdapter()
       case 'mayan':
         return CrossChainSwapFactory.getMayanAdapter()
       // case 'symbiosis':

package/src/cross/registry.ts

@@ -6,7 +6,7 @@ import type {
 } from './adapters/BaseSwapAdapter.js'
 
 export interface Quote {
-  adapter: SwapProvider
+  adapter?: SwapProvider
   quote: NormalizedQuote
 }