@openocean.finance/widget 1.0.51 → 1.0.53

package/src/cross/adapters/NearIntentsAdapter.ts

@@ -209,6 +209,7 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
     deadline.setSeconds(deadline.getSeconds() + (params.fromChain === NonEvmChain.Bitcoin ? 60 * 60 : 60 * 20))
     if (this.nearTokens.length === 0) {
       await this.getAllSupportedTokens()
+      await new Promise(resolve => setTimeout(resolve, 3000))
     }
 
     let fromAssetId: any = ''
@@ -576,75 +577,146 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
           reject('Not connected')
           return
         }
-        const isNative = (quote.quoteParams.fromToken as any).assetId === 'near'
 
-        const transactions: any = []
-        if (!isNative)
+        const fromToken = quote.quoteParams.fromToken as any
+        const isNative = fromToken.address === 'near.near'
+        const rawAmount = quote.quoteParams.amount || '0'
+        const amount = String(rawAmount) // yoctoNEAR 字符串
+
+        const transactions: {
+          signerId: string
+          receiverId: string
+          actions: any[]
+        }[] = []
+
+        // wNEAR 合约地址（标准 wrap.near）
+        const WRAP_CONTRACT_ID = 'wrap.near'
+
+        const tokenContract = fromToken.address as string | undefined
+
+        if (isNative) {
+          // 原生 NEAR：先在 wNEAR 合约上给桥地址做 storage_deposit，再 near_deposit 包成 wNEAR，然后 ft_transfer 给桥地址
           transactions.push({
             signerId: nearWallet.signedAccountId,
-            receiverId: (quote.quoteParams.fromToken as any).contractAddress,
+            receiverId: WRAP_CONTRACT_ID,
             actions: [
               {
+                // 1) storage_deposit，确保桥地址在 wNEAR 上已注册
                 type: 'FunctionCall',
                 params: {
                   methodName: 'storage_deposit',
-                  args: { account_id: depositAddress, registration_only: true },
+                  args: {
+                    account_id: depositAddress,
+                    registration_only: true,
+                  },
                   gas: '30000000000000',
                   deposit: '1250000000000000000000', // 0.00125 NEAR
                 },
               },
+              {
+                // 2) near_deposit：把原生 NEAR 包成 wNEAR
+                type: 'FunctionCall',
+                params: {
+                  methodName: 'near_deposit',
+                  args: {},
+                  gas: '30000000000000',
+                  deposit: amount, // 使用原始 NEAR 数量（yoctoNEAR）
+                },
+              },
+              {
+                // 3) ft_transfer：将 wNEAR 发送到桥地址
+                type: 'FunctionCall',
+                params: {
+                  methodName: 'ft_transfer',
+                  args: {
+                    receiver_id: depositAddress,
+                    amount,
+                  },
+                  gas: '30000000000000',
+                  deposit: '1', // NEP-141 规范要求 1 yoctoNEAR
+                },
+              },
             ],
           })
-
-        transactions.push({
-          signerId: nearWallet.signedAccountId,
-          receiverId: isNative ? depositAddress : (quote.quoteParams.fromToken as any).contractAddress,
-          actions: [
-            isNative
-              ? {
-                type: 'Transfer',
+        } else if (tokenContract) {
+          // 非原生 NEP-141 token：先在 token 合约上给桥地址做 storage_deposit，再 ft_transfer
+          transactions.push({
+            signerId: nearWallet.signedAccountId,
+            receiverId: tokenContract,
+            actions: [
+              {
+                type: 'FunctionCall',
                 params: {
-                  deposit: quote.quoteParams.amount,
+                  methodName: 'storage_deposit',
+                  args: {
+                    account_id: depositAddress,
+                    registration_only: true,
+                  },
+                  gas: '30000000000000',
+                  deposit: '1250000000000000000000', // 0.00125 NEAR
                 },
-              }
-              : {
+              },
+              {
                 type: 'FunctionCall',
                 params: {
                   methodName: 'ft_transfer',
                   args: {
                     receiver_id: depositAddress,
-                    amount: quote.quoteParams.amount,
+                    amount,
                   },
                   gas: '30000000000000',
                   deposit: '1',
                 },
               },
-          ],
-        })
+            ],
+          })
+        } else {
+          reject('Invalid NEAR token contract')
+          return
+        }
 
-        // My near wallet is redirect to wallet website -> need store to process later
-        if (nearWallet?.wallet?.id === 'my-near-wallet')
+        // MyNearWallet 会跳转到网页，需要在本地记录一次
+        if (nearWallet?.wallet?.id === 'my-near-wallet') {
           localStorage.setItem(
             'cross-chain-swap-my-near-wallet-tx',
             JSON.stringify({
               ...params,
               sourceTxHash: depositAddress,
-            }),
+            })
           )
+        }
 
-        await nearWallet
-          .signAndSendTransactions({
-            transactions,
-          })
-          .catch(e => {
+        const txResult = await nearWallet
+          .signAndSendTransactions({ transactions })
+          .catch((e: any) => {
             console.log('NearIntents signAndSendTransactions failed', e)
             if (nearWallet?.wallet?.id === 'my-near-wallet') reject()
             else reject(e)
           })
+        let transaction: any = { hash: "" };
+        if (txResult && txResult.length === 1) {
+          transaction = txResult[txResult.length - 1].transaction || {};
+        } else if (txResult && txResult.length > 1) {
+          transaction = txResult.filter((item: any) => {
+            const { actions = [] } = item && item.transaction || {};
+            const _actions = actions.filter((fc: any) => {
+              const { FunctionCall = {} } = fc;
+              const { method_name } = FunctionCall;
+              return method_name === 'ft_transfer_call';
+            });
+            return _actions && _actions.length > 0;
+          });
+          if (transaction && transaction.length) {
+            transaction = transaction[0].transaction;
+          } else {
+            transaction = txResult[txResult.length - 1].transaction || {};
+          }
+        }
+        const { hash } = transaction;
 
         resolve({
           ...params,
-          sourceTxHash: depositAddress,
+          sourceTxHash: hash,
         })
       })
     }

package/src/cross/constants/index.ts

@@ -199,6 +199,7 @@ export const MAINNET_NETWORKS = [
   ChainId.MONAD,
   ChainId.FLR,
   ChainId.CRO,
+  ChainId.RSK,
 ] as const
 
 export interface Currency {

package/src/cross/crossChainQuote.ts

@@ -213,19 +213,23 @@ export async function getCrossChainQuote({
 export const bridgeExecuteSwap = async ({
   quoteData,
   walletClient,
+  nearWallet,
 }: {
   quoteData: any
   walletClient: WalletClient
+  // Near Intents adapter 需要的 Near wallet-selector 实例，其它适配器会忽略
+  nearWallet?: any
 }) => {
   const adapterName = quoteData.quoteAdapterKey
   const adapter = CrossChainSwapFactory.getAdapterByName(adapterName)
   if (adapter) {
-    const result = await adapter?.executeSwap(
+    const result = await (adapter as any)?.executeSwap(
       {
         adapter,
         quote: quoteData.quoteRawData as any,
       },
-      walletClient
+      walletClient,
+      nearWallet
     )
     return result
   }

package/src/hooks/useGasPrice.ts

@@ -13,9 +13,9 @@ export const useGasPrice = (chainName: string) => {
     queryKey: ['gasPrice'],
     queryFn: () => OpenOceanService.getGasPrice(chainName.toLowerCase()),
   })
-  const _gasPrice = data?.[gasKey[gasPrice || 'Normal']]
+  const _gasPrice = data?.[gasKey[gasPrice || 'normal']]
   return {
-    gasPrice: _gasPrice && _gasPrice.maxFeePerGas,
+    gasPrice: _gasPrice || _gasPrice?.maxFeePerGas || data?.gasPrice || 50000000,
     isLoading,
   }
 }

package/src/hooks/useGasRecommendation.ts

@@ -1,5 +1,5 @@
 import {
-  type ChainId,
+  ChainId,
   getGasRecommendation,
 } from '@openocean.finance/widget-sdk'
 import { useQuery } from '@tanstack/react-query'
@@ -14,9 +14,12 @@ export const useGasRecommendation = (
 ) => {
   const { chains } = useAvailableChains()
 
+  const fromIsNear = fromChain === ChainId.NEAR
+
   const checkRecommendationLiFuel =
     Boolean(toChainId) &&
     Boolean(fromChain) &&
+    !fromIsNear &&
     Boolean(fromToken) &&
     Boolean(chains?.length)
 
@@ -29,6 +32,10 @@ export const useGasRecommendation = (
       queryKey: [_, toChainId, fromChain, fromToken],
       signal,
     }) => {
+      // from 是 Near 链时，当前不支持 Li.Fuel / gas 预估，直接跳过查询
+      if (fromChain === ChainId.NEAR) {
+        return null
+      }
       if (!chains?.some((chain) => chain.id === toChainId)) {
         return null
       }

package/src/hooks/useRouteExecution.ts

@@ -11,6 +11,8 @@ import { updateRouteExecution } from '@openocean.finance/widget-sdk'
 import { useMutation, useQueryClient } from '@tanstack/react-query'
 import { useCallback, useEffect, useRef } from 'react'
 import { useConfig, useWalletClient } from 'wagmi'
+// @ts-ignore - runtime implementation is provided by the host app (widget package)
+import { useWalletSelector } from '@near-wallet-selector/react-hook'
 import { shallow } from 'zustand/shallow'
 import { executeRoute } from '../services/ExecuteRoute.js'
 import {
@@ -46,6 +48,7 @@ export const useRouteExecution = ({
   const disconnect = useAccountDisconnect()
   const { openWalletMenu } = useWalletMenu()
   const solanaWallet = useWalletClient()
+  const nearWallet = useWalletSelector() as any
   // const { wallet: solanaWallet } = useWallet()
   const resumedAfterMount = useRef(false)
   const emitter = useWidgetEvents()
@@ -151,6 +154,7 @@ export const useRouteExecution = ({
         onDisconnect: disconnect,
         onOpenWalletMenu: openWalletMenu,
         solanaWallet: solanaWallet,
+        nearWallet,
       })
     },
     onMutate: () => {
@@ -187,6 +191,7 @@ export const useRouteExecution = ({
         wagmiConfig,
         onDisconnect: disconnect,
         onOpenWalletMenu: openWalletMenu,
+        nearWallet,
       })
     },
     onMutate: () => {

package/src/hooks/useRoutes.ts

@@ -303,7 +303,7 @@ export const useRoutes = ({ observableRoute }: RoutesProps = {}) => {
           // minOutAmount calculation is now handled within DebridgeService or OpenOceanService
           const isBridge = quoteResult.isBridge
           let toAmountMin = '0'
-          if (data?.minOutAmount) {
+          if (data?.minOutAmount && Number(data.minOutAmount) > 0) {
             toAmountMin = data.minOutAmount
           } else if (isBridge) {
             toAmountMin = '0'

package/src/hooks/useToken.ts

@@ -6,7 +6,6 @@ import type { TokenAmount } from '../types/token.js'
 
 export const useToken = (chainId?: number, tokenAddress?: string) => {
   const { tokens, isLoading } = useTokens(chainId)
-
   const token = useMemo(() => {
     const token = tokens?.find(
       (token: TokenAmount) => token.address === tokenAddress && token.chainId === chainId

package/src/providers/WalletProvider/NearProvider.tsx

@@ -0,0 +1,110 @@
+import type { FC, PropsWithChildren } from 'react'
+import { useEffect, useMemo } from 'react'
+import { WalletSelectorProvider } from '@near-wallet-selector/react-hook'
+import { setupMeteorWallet } from '@near-wallet-selector/meteor-wallet'
+import { setupSender } from '@near-wallet-selector/sender'
+import "@near-wallet-selector/modal-ui/styles.css";
+
+
+export const NearProvider: FC<PropsWithChildren> = ({ children }) => {
+  const config = useMemo(
+    () => ({
+      network: 'mainnet' as const,
+      modules: [setupMeteorWallet(), setupSender()],
+    }),
+    []
+  )
+
+  // 在这里注入你自己的全局 CSS，覆盖 Near modal 的样式
+  useEffect(() => {
+    const styleId = 'near-wallet-selector-custom-style'
+    let styleEl = document.getElementById(styleId) as HTMLStyleElement | null
+
+    if (!styleEl) {
+      styleEl = document.createElement('style')
+      styleEl.id = styleId
+      document.head.appendChild(styleEl)
+    }
+
+    styleEl.textContent = `
+      /* 覆盖 Near modal 最外层容器 */
+      #near-wallet-selector-modal {
+        z-index: 1200 !important;    /* 保证在你自己的 widget 之上 */
+        font-family: inherit;        /* 或者用你自己的字体 */
+      }
+
+      /* 覆盖遮罩层 */
+      #near-wallet-selector-modal .nws-modal-overlay {
+        background: rgba(0, 0, 0, 0.75) !important;
+      }
+
+      /* 覆盖内容区域，可以调圆角/阴影等 */
+      #near-wallet-selector-modal .nws-modal {
+        width: 420px !important;
+        border-radius: 24px;
+        box-shadow: 0 24px 48px rgba(0, 0, 0, 0.5);
+        background-color: #222037 !important;
+        z-index: 1300 !important;
+        position: absolute;
+      }
+      #near-wallet-selector-modal .nws-modal .modal-left {
+        border:none !important;
+        width: 100% !important;
+      }
+      #near-wallet-selector-modal .nws-modal .modal-right {
+        background-color: #222037 !important;
+        display: none;
+      }
+      .nws-modal-wrapper .nws-modal .modal-left .modal-left-title{
+        padding-top: 0 !important;
+      }
+      .nws-modal-wrapper .nws-modal .modal-left .modal-left-title h2{
+        text-align: center;
+        color: #ffffff !important;
+      }
+      .nws-modal-wrapper .nws-modal .modal-left .modal-left-title .nws-remember-wallet{
+        display: none;
+      }
+      .nws-modal-wrapper .nws-modal .modal-left .modal-left-title .nws-switch{
+        display: none;
+      }
+      .nws-modal-wrapper .nws-modal .modal-left .modal-left-title {
+        position: relative;
+        width: 100%;
+        background-color: #222037 !important;
+      }
+      .nws-modal-wrapper .nws-modal .wallet-options-wrapper{
+        margin-top: 20px;
+      }
+      .nws-modal-wrapper .nws-modal .wallet-options-wrapper .options-list {
+        display: block;
+
+      }
+      .nws-modal-wrapper .nws-modal .wallet-options-wrapper .options-list .single-wallet.sidebar{
+        margin:10px 0;
+      }
+      .nws-modal-wrapper .nws-modal .wallet-options-wrapper .title{
+        color: #ffffff !important;
+      }
+      .options-list-section-header{
+        display: none !important;
+      }
+      .nws-modal-wrapper .nws-modal .wallet-options-wrapper .options-list .single-wallet.sidebar.selected-wallet{
+        background-color: inherit;
+      }
+      .nws-modal-wrapper .nws-modal .wallet-options-wrapper .options-list .single-wallet.sidebar.selected-wallet:hover{
+        background-color: #2d3860;
+      }
+    `
+    // 一般可以保留样式，不需要卸载时删除
+  }, [])
+
+
+
+  return (
+    <WalletSelectorProvider config={config}>
+      {children}
+    </WalletSelectorProvider>
+  )
+}
+

package/src/providers/WalletProvider/SDKProviders.tsx

@@ -3,6 +3,7 @@ import { useConfig as useBigmiConfig } from '@bigmi/react'
 import type { SDKProvider } from '@openocean.finance/widget-sdk'
 import {
   ChainType,
+  Near,
   EVM,
   Solana,
   UTXO,
@@ -22,6 +23,7 @@ export const SDKProviders = () => {
   const { sdkConfig } = useWidgetConfig()
   const { wallet } = useWallet()
   const wagmiConfig = useWagmiConfig()
+  const nearProvider = Near()
   const bigmiConfig = useBigmiConfig()
 
   useEffect(() => {
@@ -63,6 +65,9 @@ export const SDKProviders = () => {
         })
       )
     }
+        // Always register a Near (NVM) provider so balances can be queried for NEAR.
+    providers.push(nearProvider)
+
     if (sdkConfig?.providers?.length) {
       providers.push(...sdkConfig.providers)
     }

package/src/providers/WalletProvider/useExternalWalletProvider.ts

@@ -11,7 +11,7 @@ interface ExternalWalletProvider {
   internalChainTypes: ChainType[]
 }
 
-const internalChainTypes = [ChainType.EVM, ChainType.SVM, ChainType.UTXO]
+const internalChainTypes = [ChainType.EVM, ChainType.SVM, ChainType.UTXO, ChainType.NVM]
 
 export function useExternalWalletProvider(): ExternalWalletProvider {
   const { walletConfig } = useWidgetConfig()

package/src/services/ExecuteRoute.ts

@@ -261,6 +261,8 @@ interface ExecuteRouteOptions {
   onDisconnect?: (account: Account) => Promise<void>
   onOpenWalletMenu?: () => void
   solanaWallet?: any
+  // Near wallet-selector 实例从 React 层通过 options 传入，避免在此文件中直接调用 Hook
+  nearWallet?: any
 }
 
 interface ExtendedOpenOceanStep extends OpenOceanStep {
@@ -351,6 +353,7 @@ async function executeSolanaSwap(
       const signedTx = await bridgeExecuteSwap({
         quoteData: quoteData,
         walletClient: adaptedWallet,
+        nearWallet: options.nearWallet,
       })
       if (!signedTx) {
         throw new Error('Failed to sign transaction')
@@ -606,6 +609,7 @@ async function executeEvmSwap(
       const result = await bridgeExecuteSwap({
         quoteData: quoteData,
         walletClient: walletClient,
+        nearWallet: options.nearWallet,
       })
       hash = result?.sourceTxHash || ''
     } else {
@@ -1005,6 +1009,7 @@ async function executeBitcoinSwap(
     const signedTx = await bridgeExecuteSwap({
       quoteData: quoteData,
       walletClient: adaptedWallet,
+      nearWallet: options.nearWallet,
     });
 
     if (!signedTx) {
@@ -1043,6 +1048,133 @@ async function executeBitcoinSwap(
     throw error
   }
 }
+
+// Execute Near transaction via Near Intents adapter
+async function executeNearSwap(
+  step: ExtendedOpenOceanStep,
+  options: ExecuteRouteOptions,
+  process: Process,
+  route: ExtendedRoute
+): Promise<void> {
+  try {
+    const { type, transactionRequest } = step || {}
+
+    if ((type as any) === 'bridge') {
+
+      const { quoteData } = step || {}
+
+      if (!quoteData) {
+        throw new Error('Missing Near quote data.')
+      }
+
+      // NearIntentsAdapter 的 Near 分支只依赖 nearWallet，不依赖 walletClient，
+      // 这里传一个占位对象即可。
+      const dummyWalletClient: any = {}
+
+      const result = await bridgeExecuteSwap({
+        quoteData,
+        walletClient: dummyWalletClient,
+        nearWallet: options.nearWallet,
+      })
+
+      if (!result) {
+        throw new Error('Failed to execute Near swap.')
+      }
+
+      const hash = result.sourceTxHash
+
+      process.status = 'DONE'
+      process.doneAt = Date.now()
+      process.txHash = hash
+      process.message = 'Transaction confirmed'
+      step.execution!.status = 'DONE'
+      options.updateRouteHook?.(route)
+    } else {
+      let transactions = JSON.parse(Buffer.from(transactionRequest.data, 'base64').toString())
+      const wallet = options.nearWallet
+      const txs = transactions.map((t: any, i: number) => {
+        return {
+          receiverId: t.receiverId,
+          // nonceOffset: i + 1,
+          signerId: wallet.signedAccountId,
+          actions: t.functionCalls.map((fc: any) => {
+            if (fc.deposit) {
+              const depositNum = typeof fc.deposit === 'string' ? parseFloat(fc.deposit) : fc.deposit
+              if (depositNum > 0) {
+                const depositStr = depositNum.toFixed(24)
+                fc.deposit = depositStr.replace('.', '').replace(/^0+/, '') || '0'
+              } else {
+                fc.deposit = '0'
+              }
+            }
+            return {
+              type: 'FunctionCall',
+              params: {
+                methodName: fc.methodName,
+                args: {
+                  ...fc.args,
+                },
+                gas: fc.gas,
+                deposit: fc.deposit,
+              },
+            }
+          })
+        };
+      })
+      const txResult = await wallet.signAndSendTransactions({
+        transactions: txs
+      });
+
+      let transaction: any = { hash: "" };
+      if (txResult && txResult.length === 1) {
+        transaction = txResult[txResult.length - 1].transaction || {};
+      } else if (txResult && txResult.length > 1) {
+        transaction = txResult.filter((item: any) => {
+          const { actions = [] } = item && item.transaction || {};
+          const _actions = actions.filter((fc: any) => {
+            const { FunctionCall = {} } = fc;
+            const { method_name } = FunctionCall;
+            return method_name === 'ft_transfer_call';
+          });
+          return _actions && _actions.length > 0;
+        });
+        if (transaction && transaction.length) {
+          transaction = transaction[0].transaction;
+        } else {
+          transaction = txResult[txResult.length - 1].transaction || {};
+        }
+      }
+      console.log('signAndSendTransactions', transaction);
+      const { hash } = transaction;
+      process.status = 'DONE'
+      process.doneAt = Date.now()
+      process.txHash = hash
+      process.message = 'Transaction confirmed'
+      step.execution!.status = 'DONE'
+      options.updateRouteHook?.(route)
+    }
+  } catch (error) {
+    console.error('Near swap execution failed:', error)
+    process.status = 'FAILED'
+    process.error =
+      error instanceof Error || (error && (error as any)?.message)
+        ? {
+          code: 'EXECUTION_ERROR',
+          message: error instanceof Error ? error.message : 'Unknown error occurred',
+          htmlMessage:
+            error instanceof Error ? error.message : 'Unknown error occurred',
+        }
+        : {
+          code: 'UNKNOWN_ERROR',
+          message: 'Unknown error occurred',
+          htmlMessage: 'Unknown error occurred',
+        }
+    step.execution!.status = 'FAILED'
+    options.updateRouteHook?.(route)
+    throw error
+  }
+
+}
 // Execute transaction
 async function executeSwap(
   route: ExtendedRoute,
@@ -1081,13 +1213,14 @@ async function executeSwap(
         }
         throw new Error('Please connect wallet first')
       }
-
       // Execute different transaction logic based on chain type
       const currentStep = route.steps[0]
       if (currentStep.action?.fromChainId === 1151111081099710) {
         await executeSolanaSwap(currentStep, options, process, updatedRoute)
       } else if (currentStep.action?.fromChainId === 20000000000001) {
         await executeBitcoinSwap(currentStep, options, process, updatedRoute)
+      } else if (currentStep.action?.fromChainId === 20000000000006) {
+        await executeNearSwap(currentStep, options, process, updatedRoute)
       } else {
         await executeEvmSwap(currentStep, options, process, updatedRoute)
       }