@openocean.finance/widget 1.0.13 → 1.0.15

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@openocean.finance/widget",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "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": "./src/index.ts",
-  "types": "./src/index.d.ts",
+  "main": "./dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
   "sideEffects": false,
   "scripts": {
     "watch": "tsc -w -p ./tsconfig.json",

package/src/hooks/useRoutes.ts

@@ -261,7 +261,7 @@ export const useRoutes = ({ observableRoute }: RoutesProps = {}) => {
               quoteResult.isDebridgeRoute = false
             }
           }
-          const data = quoteResult || {}
+          const data = quoteResult && quoteResult.data || {}
           // minOutAmount calculation is now handled within DebridgeService or OpenOceanService
           const isDebridge = data.isDebridgeRoute === true
 
@@ -277,7 +277,6 @@ export const useRoutes = ({ observableRoute }: RoutesProps = {}) => {
             toAmountMin = minAmount.toFixed(20).replace(/\.?0+$/, '');
             // 如果还是科学计数法，再强制转字符串
             if (toAmountMin.includes('e') || toAmountMin.includes('E')) {
-              debugger;
               toAmountMin = minAmount.toLocaleString('fullwide', { useGrouping: false, maximumSignificantDigits: 21 });
               toAmountMin = toAmountMin.replace(/\.?0+$/, '');
             }

package/src/services/OpenOceanService.ts

@@ -9,9 +9,10 @@ interface OpenOceanToken {
 }
 
 export class OpenOceanService {
-  private static readonly API_V1_URL = 'https://ethapi.openocean.finance/v1'
-  private static readonly API_V2_URL = 'https://ethapi.openocean.finance/v2'
+  // private static readonly API_V1_URL = 'https://ethapi.openocean.finance/v1'
+  //private static readonly API_V2_URL = 'https://ethapi.openocean.finance/v2'
   private static readonly API_V3_URL = 'https://open-api.openocean.finance/v3'
+  private static readonly API_V4_URL = 'https://open-api.openocean.finance/v4'
 
   // Chain ID to OpenOcean chain name mapping
   private static readonly CHAIN_ID_MAP: Record<string | number, string> = {
@@ -28,8 +29,8 @@ export class OpenOceanService {
     // If chainId exists in CHAIN_ID_MAP, use V1 API
     const chainName = this.getChainName(chainId)
     return Object.keys(this.CHAIN_ID_MAP).includes(chainId.toString())
-      ? `${this.API_V1_URL}/${chainName}`
-      : `${this.API_V2_URL}/${chainId}`
+      ? `${this.API_V4_URL}/${chainName}`
+      : `${this.API_V4_URL}/${chainId}`
   }
 
   static async getQuote(params: {
@@ -46,16 +47,16 @@ export class OpenOceanService {
     referrer?: string
   }) {
     const apiUrl = this.getApiUrl(params.chain)
-    const slippage = (Number(params.slippage || '1') * 10000).toString()
+    const slippage = (Number(params.slippage || 0.01)).toString();
     const queryParams = new URLSearchParams({
       quoteType: 'quote',
       inTokenSymbol: params.inTokenSymbol,
       inTokenAddress: params.inTokenAddress,
       outTokenSymbol: params.outTokenSymbol,
       outTokenAddress: params.outTokenAddress,
-      amount: params.amount,
+      amountDecimals: params.amount,
       slippage,
-      gasPrice: params.gasPrice || '',
+      gasPriceDecimals: params.gasPrice || '',
       disabledDexIds: params.disabledDexIds || '',
       enabledDexIds: params.enabledDexIds || '',
       referrer: params.referrer || '0x3487ef9f9b36547e43268b8f0e2349a226c70b53',
@@ -82,22 +83,27 @@ export class OpenOceanService {
     referrerFeeShare?: string
   }) {
     const apiUrl = this.getApiUrl(params.chain)
-    const slippage = (Number(params.slippage || '1') * 10000).toString()
+    const slippage = (Number(params.slippage || 0.01)).toString();
+    const referrer: any = {
+      referrer: params.referrer || '0x3487ef9f9b36547e43268b8f0e2349a226c70b53',
+    }
+    if (params.referrerFee) {
+      referrer.referrerFee = (Number(params.referrerFee) * 100).toString();
+      referrer.referrerFeeShare = params.referrerFeeShare || '1500';
+    }
     const queryParams = new URLSearchParams({
       quoteType: 'swap',
       inTokenSymbol: params.inTokenSymbol,
       inTokenAddress: params.inTokenAddress,
       outTokenSymbol: params.outTokenSymbol,
       outTokenAddress: params.outTokenAddress,
-      amount: params.amount,
+      amountDecimals: params.amount,
       account: params.account,
       slippage,
-      gasPrice: params.gasPrice || '',
+      gasPriceDecimals: params.gasPrice || '',
       disabledDexIds: params.disabledDexIds || '',
       enabledDexIds: params.enabledDexIds || '',
-      referrer: params.referrer || '0x3487ef9f9b36547e43268b8f0e2349a226c70b53',
-      referrerFee: (Number(params.referrerFee || '0') * 100).toString(),
-      referrerFeeShare: params.referrerFeeShare || '1500',
+      ...referrer,
     })
     const isV1Api = Object.keys(this.CHAIN_ID_MAP).includes(params.chain.toString())
     const swapEndpoint = isV1Api ? 'swap-quote' : 'swap'
@@ -107,7 +113,7 @@ export class OpenOceanService {
 
   static async getTokenList(chain: string) {
     const chainName = this.getChainName(chain)
-    const response = await fetch(`${this.API_V3_URL}/${chainName}/tokenList`)
+    const response = await fetch(`${this.API_V4_URL}/${chainName}/tokenList`)
     const data = await response.json()
     if (data.code !== 200) {
       throw new Error('Failed to fetch token list')
@@ -152,8 +158,8 @@ export class OpenOceanService {
       }
     }
     // const apiUrl = this.getApiUrl(chain)
-    const response = await fetch(`${this.API_V2_URL}/${chain}/gas-price`)
-    const data = await response.json()
+    const response = await fetch(`${this.API_V4_URL}/${chain}/gasPrice`)
+    const { data } = await response.json()
     return data
   }
 
@@ -162,8 +168,8 @@ export class OpenOceanService {
     // Check if the address is valid
     if (!tokenAddress || (!/^0x[a-fA-F0-9]{40}$/.test(tokenAddress) && !/^[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(tokenAddress))) {
       throw new Error('Invalid token address')
-    }
-    const response = await fetch(`${this.API_V3_URL}/${chainName}/getTokenInfo?tokenAddress=${tokenAddress}`)
+    } 
+    const response = await fetch(`${this.API_V4_URL}/${chainName}/getTokenInfo?tokenAddress=${tokenAddress}`)
     const data = await response.json()
     if (!data || !data.address || !data.symbol || !data.decimals) {
       throw new Error('Failed to fetch token info')