@openocean.finance/widget 1.0.39 → 1.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/widget",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "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",
@@ -40,25 +40,25 @@
     "openocean"
   ],
   "dependencies": {
+    "@across-protocol/app-sdk": "^0.2.0",
     "@bigmi/client": "^0.1.1",
     "@bigmi/core": "^0.1.1",
+    "@defuse-protocol/one-click-sdk-typescript": "^0.1.2",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
+    "@lifi/sdk": "^3.6.8",
+    "@mayanfinance/swap-sdk": "^11.0.1",
     "@mui/icons-material": "6.0.2",
     "@mui/material": "^6.4.8",
     "@mui/system": "^6.4.8",
-    "@openocean.finance/wallet-management": "^1.0.12",
-    "@openocean.finance/widget-sdk": "^1.0.10",
-    "@across-protocol/app-sdk": "^0.2.0",
+    "@openocean.finance/wallet-management": "^1.0.13",
+    "@openocean.finance/widget-sdk": "^1.0.12",
     "@near-wallet-selector/react-hook": "^9.0.0",
     "@reservoir0x/relay-sdk": "^2.4.0",
-    "@lifi/sdk": "^3.6.8",
-    "@mayanfinance/swap-sdk": "^11.0.1",
-    "@defuse-protocol/one-click-sdk-typescript": "^0.1.2",
+    "@reservoir0x/relay-solana-wallet-adapter": "^2.0.5",
     "@solana/wallet-adapter-base": "^0.9.24",
     "@solana/web3.js": "^1.98.0",
     "@tanstack/react-virtual": "^3.13.4",
-    "@reservoir0x/relay-solana-wallet-adapter": "^2.0.5",
     "ethers": "^6.13.5",
     "i18next": "^24.2.3",
     "microdiff": "^1.5.0",

package/src/config/defaultChainIds.ts

@@ -37,4 +37,7 @@ export const DEFAULT_CHAIN_IDS = [
   10143,    // Monad Testnet
   1151111081099710, // Solana
   999,      // HyperEvm
+  9745,     // Plasma
+  98866,    // Plume
+  239,      // Tac
 ]; 

package/src/config/version.ts

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

package/src/cross/adapters/BaseSwapAdapter.ts

@@ -17,6 +17,7 @@ export enum NonEvmChain {
   Near = 'near',
   Bitcoin = 20000000000001,
   Solana = 1151111081099710,
+  Plasma = 9745,
 }
 
 export const BitcoinToken = {
@@ -48,6 +49,10 @@ export const NonEvmChainInfo: {
     name: 'Solana',
     icon: 'https://solana.com/favicon.png',
   },
+  [NonEvmChain.Plasma]: {
+    name: 'Plasma',
+    icon: 'https://storage.googleapis.com/ks-setting-1d682dca/285205e7-a16d-421c-a794-67439cd6b54f1751515894455.png',
+  },
 }
 
 export const NOT_SUPPORTED_CHAINS_PRICE_SERVICE = [
@@ -59,6 +64,7 @@ export const NOT_SUPPORTED_CHAINS_PRICE_SERVICE = [
   NonEvmChain.Solana,
   NonEvmChain.Bitcoin,
   NonEvmChain.Near,
+  NonEvmChain.Plasma,
 ]
 
 export interface QuoteParams {

package/src/cross/adapters/MayanAdapter.ts

@@ -38,13 +38,10 @@ const mappingChain: Record<string, ChainName> = {
   [ChainId.HYE]: 'hyperevm',
   [ChainId.SOL]: 'solana',
   [ChainId.SUI]: 'sui',
+  // [ChainId.PLA]: 'plasma',
 }
 
 export class MayanAdapter extends BaseSwapAdapter {
-  constructor() {
-    super()
-  }
-
   getName(): string {
     return 'Mayan'
   }
@@ -60,6 +57,9 @@ export class MayanAdapter extends BaseSwapAdapter {
   }
 
   async getQuote(params: EvmQuoteParams): Promise<NormalizedQuote> {
+    if (params.fromChain === ChainId.SOL) {
+      throw new Error('No quotes found')
+    }
     const quoteParams = {
       amount: +formatUnits(BigInt(params.amount), params.fromToken.decimals),
       fromToken: params.fromToken.isNative
@@ -119,40 +119,63 @@ export class MayanAdapter extends BaseSwapAdapter {
     { quote }: Quote,
     walletClient: WalletClient
   ): Promise<NormalizedTxResponse> {
-    const account = walletClient.account?.address
-    if (!account) throw new Error('WalletClient account is not defined')
-
-    const res = getSwapFromEvmTxPayload(
-      quote.rawQuote as MayanQuote,
-      account,
-      quote.quoteParams.recipient,
-      { evm: CROSS_CHAIN_FEE_RECEIVER },
-      account,
-      quote.quoteParams.fromChain,
-      null,
-      null
-    )
+    const account: any = quote.quoteParams.sender
+    if (!account) {
+      throw new Error('WalletClient account is not defined')
+    }
 
-    if (res.to && res.value && res.data) {
-      const tx = await walletClient.sendTransaction({
-        chain: undefined,
+    if (!quote.quoteParams.fromChain) {
+      throw new Error(`Invalid fromChain: ${quote.quoteParams.fromChain}`)
+    }
+    const fromChain =
+      quote.quoteParams.fromChain === ChainId.SOL
+        ? 'solana'
+        : quote.quoteParams.fromChain
+
+    if (fromChain === 'solana') {
+      // const res = getSwapSolana({
+      //   amountIn64: quote.quoteParams.amount,
+      //   fromToken: quote.quoteParams.fromToken,
+      //   minMiddleAmount: 0,
+      //   middleToken: quote.quoteParams.toToken,
+      //   userWallet: account,
+      //   slippageBps: quote.quoteParams.slippage,
+      //   referrerAddress: CROSS_CHAIN_FEE_RECEIVER,
+      // })
+      // debugger
+    } else {
+      const res = getSwapFromEvmTxPayload(
+        quote.rawQuote as MayanQuote,
+        account,
+        quote.quoteParams.recipient,
+        { evm: CROSS_CHAIN_FEE_RECEIVER },
         account,
-        to: res.to as `0x${string}`,
-        value: BigInt(res.value),
-        data: res.data as `0x${string}`,
-      })
-      return {
-        sender: quote.quoteParams.sender,
-        id: tx, // specific id for each provider
-        sourceTxHash: tx,
-        adapter: this.getName(),
-        sourceChain: quote.quoteParams.fromChain,
-        targetChain: quote.quoteParams.toChain,
-        inputAmount: quote.quoteParams.amount,
-        outputAmount: quote.outputAmount.toString(),
-        sourceToken: quote.quoteParams.fromToken,
-        targetToken: quote.quoteParams.toToken,
-        timestamp: new Date().getTime(),
+        fromChain,
+        null,
+        null
+      )
+      if (res.to && res.value && res.data) {
+        const tx = await walletClient.sendTransaction({
+          chain: undefined,
+          account: account as `0x${string}`,
+          to: res.to as `0x${string}`,
+          value: BigInt(res.value),
+          data: res.data as `0x${string}`,
+          kzg: undefined,
+        })
+        return {
+          sender: quote.quoteParams.sender,
+          id: tx, // specific id for each provider
+          sourceTxHash: tx,
+          adapter: this.getName(),
+          sourceChain: quote.quoteParams.fromChain,
+          targetChain: quote.quoteParams.toChain,
+          inputAmount: quote.quoteParams.amount,
+          outputAmount: quote.outputAmount.toString(),
+          sourceToken: quote.quoteParams.fromToken,
+          targetToken: quote.quoteParams.toToken,
+          timestamp: new Date().getTime(),
+        }
       }
     }
 

package/src/cross/adapters/RelayAdapter.ts

@@ -69,6 +69,35 @@ const hyperEvm = defineChain({
   },
 })
 
+const plasma = defineChain({
+  id: 9745,
+  name: 'Plasma',
+  blockTime: 1000,
+  nativeCurrency: {
+    name: 'Plasma',
+    symbol: 'XPL',
+    decimals: 18,
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.plasma.to'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'PlasmaScan',
+      url: 'https://plasmascan.to',
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
+      blockCreated: 0,
+    },
+  },
+})
+
+
 const SolanaChainId = 792703809
 
 const solanaChain = {
@@ -103,6 +132,7 @@ export class RelayAdapter extends BaseSwapAdapter {
         ronin,
         unichain,
         hyperEvm,
+        plasma
       ]
         .map(convertViemChainToRelayChain)
         .concat(solanaChain as any),
@@ -116,7 +146,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, ...MAINNET_NETWORKS]
+    return [NonEvmChain.Solana, NonEvmChain.Plasma, ...MAINNET_NETWORKS]
     // return [...MAINNET_NETWORKS]
   }
 
@@ -154,6 +184,7 @@ export class RelayAdapter extends BaseSwapAdapter {
             fee: params.feeBps.toString(),
           },
         ],
+        protocolVersion:'preferV2'
         // includedSwapSources: ['open-ocean'],
       },
     })

package/src/index.ts

@@ -1,3 +1,4 @@
+
 export type * from '@openocean.finance/widget-sdk'
 export { ChainType, ChainId, CoinKey } from '@openocean.finance/widget-sdk'
 export { App as OpenOceanWidget } from './App.js'
@@ -28,4 +29,4 @@ export { getPriceImpact } from './utils/getPriceImpact.js'
 export { percentFormatter } from './utils/percentFormatter.js'
 export { compactNumberFormatter } from './utils/compactNumberFormatter.js'
 export { currencyExtendedFormatter } from './utils/currencyExtendedFormatter.js'
-export { navigationRoutes } from './utils/navigationRoutes.js'
+export { navigationRoutes } from './utils/navigationRoutes.js'

package/src/stores/routes/createRouteExecutionStore.ts

@@ -13,7 +13,7 @@ import {
   isRouteRefunded,
 } from './utils.js'
 
-const replaceBigInts = (obj: any): any => {
+const replaceBigInts = (obj: any, visited = new WeakSet()): any => {
   if (obj === null || obj === undefined) {
     return obj
   }
@@ -22,14 +22,28 @@ const replaceBigInts = (obj: any): any => {
     return obj.toString()
   }
 
+  // 检查循环引用
+  if (typeof obj === 'object' && visited.has(obj)) {
+    return '[Circular Reference]'
+  }
+
   if (Array.isArray(obj)) {
-    return obj.map(replaceBigInts)
+    visited.add(obj)
+    const result = obj.map((item) => replaceBigInts(item, visited))
+    visited.delete(obj)
+    return result
   }
 
   if (typeof obj === 'object') {
-    return Object.fromEntries(
-      Object.entries(obj).map(([key, value]) => [key, replaceBigInts(value)])
+    visited.add(obj)
+    const result = Object.fromEntries(
+      Object.entries(obj).map(([key, value]) => [
+        key,
+        replaceBigInts(value, visited),
+      ])
     )
+    visited.delete(obj)
+    return result
   }
 
   return obj