@openocean.finance/widget 1.0.43 → 1.0.44

package/src/App.tsx

@@ -25,7 +25,6 @@ export const App = forwardRef<WidgetDrawer, WidgetProps>((props, ref) => {
         },
       }
     }
-
     // config.subvariant = 'bridge'
     // config.subvariantOptions = {
     //   custom: 'checkout',

package/src/components/AmountInput/AmountInputEndAdornment.tsx

@@ -66,6 +66,9 @@ export const AmountInputEndAdornment = ({ formType }: FormTypeProps) => {
       ) {
         return 0n
       }
+      if(!token){
+        return 0n
+      }
       let srcChainTokenInAmount: any = token.amount || 0
       const asUsd =
         Number(token.priceUSD) * (Number(token.amount) / 10 ** token.decimals)
@@ -99,42 +102,44 @@ export const AmountInputEndAdornment = ({ formType }: FormTypeProps) => {
 
     const chain = getChainById(fromChainId)
     let maxAmount = token.amount
-
     let gas = 0n
-    // if (
-    //   state === 'bridge' &&
-    //   fromChainId !== toChainId &&
-    //   fromTokenAddress &&
-    //   toTokenAddress
-    // ) {
-    //   if (routes) {
-    //     const router: any = routes[0] || {
-    //       toAmount: 0,
-    //       toToken: { decimals: 18 },
-    //     }
-    //     if (
-    //       router &&
-    //       router.data &&
-    //       router.data.prependedOperatingExpenseCost
-    //     ) {
-    //       prependedOperatingExpenseCost =
-    //         router.data.prependedOperatingExpenseCost
-    //     }
-    //   }
+    if (
+      state === 'bridge' &&
+      fromChainId !== toChainId &&
+      fromTokenAddress &&
+      toTokenAddress
+    ) {
+      // if(fromChainId === 20000000000001) {
+      //   gas = 22000n
+      // }
+      // if (routes) {
+      //   const router: any = routes[0] || {
+      //     toAmount: 0,
+      //     toToken: { decimals: 18 },
+      //   }
+      //   if (
+      //     router &&
+      //     router.data &&
+      //     router.data.prependedOperatingExpenseCost
+      //   ) {
+      //     prependedOperatingExpenseCost =
+      //       router.data.prependedOperatingExpenseCost
+      //   }
+      // }
 
-    //   gas = BigInt(
-    //     Number.parseInt(
-    //       (1.15 * Number(prependedOperatingExpenseCost)).toString()
-    //     )
-    //   )
-    //   if (chain?.nativeToken?.address === fromTokenAddress) {
-    //     if (fromChainId === 1151111081099710) {
-    //       gas += 15000000n + (8157120n + 4000000n + 890880n)
-    //     } else if (fromChainId === 8453) {
-    //       gas += 1000000000000000n + 1000000000000n
-    //     }
-    //   }
-    // }
+      // gas = BigInt(
+      //   Number.parseInt(
+      //     (1.15 * Number(prependedOperatingExpenseCost)).toString()
+      //   )
+      // )
+      // if (chain?.nativeToken?.address === fromTokenAddress) {
+      //   if (fromChainId === 1151111081099710) {
+      //     gas += 15000000n + (8157120n + 4000000n + 890880n)
+      //   } else if (fromChainId === 8453) {
+      //     gas += 1000000000000000n + 1000000000000n
+      //   }
+      // }
+    }
 
     if (state === 'swap' || fromChainId === toChainId) {
       if (

package/src/components/BaseTransactionButton/BaseTransactionButton.tsx

@@ -18,14 +18,15 @@ export const BaseTransactionButton: React.FC<BaseTransactionButtonProps> = ({
   const [fromChainId] = useFieldValues('fromChain')
   const { chain } = useChain(fromChainId)
   const { account } = useAccount({ chainType: chain?.chainType })
-
   const handleClick = async () => {
     if (account.isConnected) {
       onClick?.()
     } else if (walletConfig?.onConnect) {
       walletConfig.onConnect()
     } else {
-      openWalletMenu()
+      openWalletMenu(
+        chain?.chainType ? { chainType: chain.chainType } : undefined
+      )
     }
   }
 

package/src/components/Messages/WarningMessages.tsx

@@ -52,6 +52,7 @@ export const WarningMessages: React.FC<WarningMessagesProps> = ({
           />
         )
       case 'TO_ADDRESS_REQUIRED':
+        // return <ToAddressRequiredMessage {...props} />
         const fromChainId = route?.fromChainId
         const toChainId = route?.toChainId
         if (fromChainId && toChainId && fromChainId !== toChainId) {

package/src/components/Messages/useMessageQueue.ts

@@ -12,7 +12,7 @@ import { useServerErrorStore } from '../../stores/useServerErrorStore.js'
 export const useStorePriceImpactAcknowledged = create((set) => ({
   priceImpactAcknowledged: false,
   setPriceImpactAcknowledged: (v: boolean) =>
-    set((state) => {
+    set(() => {
       return {
         priceImpactAcknowledged: v,
       }

package/src/components/TransactionDetails.tsx

@@ -68,10 +68,10 @@ export const TransactionDetails: React.FC<TransactionDetailsProps> = ({
   }
 
   let gasCostUSD = 0
-  const feeCosts = []
+  const feeCosts:any = []
   const combinedFeesUSD =
-    gasCostUSD + feeCosts.reduce((sum, fee) => sum + fee.costUSD, 0)
-  const feeCostUSD = feeCosts.reduce((sum, fee) => sum + fee.costUSD, 0)
+    gasCostUSD + feeCosts.reduce((sum:number, fee:any) => sum + fee.costUSD, 0)
+  const feeCostUSD = feeCosts.reduce((sum:number, fee:any) => sum + fee.costUSD, 0)
   const estimatedGas =
     (route as any)?.estimatedGas || (route as any)?.data?.estimatedGas
   if (token && gasPrice && estimatedGas) {
@@ -317,7 +317,7 @@ export const TransactionDetails: React.FC<TransactionDetailsProps> = ({
                     </Typography>
                     <Typography variant="body2" sx={{ fontWeight: 600 }}>
                       {t('format.percent', {
-                        value: route.steps[0].action.slippage / 100,
+                        value: route.steps[0]?.action?.slippage ? route.steps[0].action.slippage / 100 : 0,
                       })}
                     </Typography>
                   </Box>

package/src/config/defaultChainIds.ts

@@ -40,4 +40,7 @@ export const DEFAULT_CHAIN_IDS = [
   9745,     // Plasma
   98866,    // Plume
   239,      // Tac
+  143,      // Monad
+  20000000000001, // Bitcoin
+  20000000000006, // Near
 ]; 

package/src/config/version.ts

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

package/src/cross/adapters/AcrossAdapter.ts

@@ -22,19 +22,19 @@ import {
 const transferFunction = 'function transfer(address to, uint256 amount)'
 
 // Create Interface instances
-const erc20Interface = new ethers.utils.Interface([transferFunction])
+const erc20Interface = new ethers.Interface([transferFunction])
 
 const multicalHandlerContract: Record<string, `0x${string}`> = {
-  [ChainId.MAINNET]: '0x924a9f036260DdD5808007E1AA95f08eD08aA569',
-  [ChainId.ARBITRUM]: '0x924a9f036260DdD5808007E1AA95f08eD08aA569',
-  [ChainId.OPTIMISM]: '0x924a9f036260DdD5808007E1AA95f08eD08aA569',
-  [ChainId.LINEA]: '0x1015c58894961F4F7Dd7D68ba033e28Ed3ee1cDB',
-  [ChainId.MATIC]: '0x924a9f036260DdD5808007E1AA95f08eD08aA569',
-  [ChainId.ZKSYNC]: '0x863859ef502F0Ee9676626ED5B418037252eFeb2',
-  [ChainId.BASE]: '0x1015c58894961F4F7Dd7D68ba033e28Ed3ee1cDB',
-  [ChainId.SCROLL]: '0x1015c58894961F4F7Dd7D68ba033e28Ed3ee1cDB',
-  [ChainId.BLAST]: '0x1015c58894961F4F7Dd7D68ba033e28Ed3ee1cDB',
-  [ChainId.UNICHAIN]: '0x1015c58894961F4F7Dd7D68ba033e28Ed3ee1cDB',
+  [ChainId.ETH]: '0x924a9f036260DdD5808007E1AA95f08eD08aA569',
+  [ChainId.ARB]: '0x924a9f036260DdD5808007E1AA95f08eD08aA569',
+  [ChainId.OPT]: '0x924a9f036260DdD5808007E1AA95f08eD08aA569',
+  [ChainId.LNA]: '0x1015c58894961F4F7Dd7D68ba033e28Ed3ee1cDB',
+  [ChainId.POL]: '0x924a9f036260DdD5808007E1AA95f08eD08aA569',
+  // [ChainId.ZKSYNC]: '0x863859ef502F0Ee9676626ED5B418037252eFeb2',
+  [ChainId.BAS]: '0x1015c58894961F4F7Dd7D68ba033e28Ed3ee1cDB',
+  [ChainId.SCL]: '0x1015c58894961F4F7Dd7D68ba033e28Ed3ee1cDB',
+  [ChainId.BLS]: '0x1015c58894961F4F7Dd7D68ba033e28Ed3ee1cDB',
+  [ChainId.UNI]: '0x1015c58894961F4F7Dd7D68ba033e28Ed3ee1cDB',
 }
 
 export class AcrossAdapter extends BaseSwapAdapter {
@@ -46,7 +46,7 @@ export class AcrossAdapter extends BaseSwapAdapter {
       integratorId: `0x008a`,
       chains: [mainnet, arbitrum, optimism, linea, polygon, zksync, base, scroll, blast, unichain],
       rpcUrls: {
-        [ChainId.BASE]: 'https://base.drpc.org',
+        [ChainId.BAS]: 'https://base.drpc.org',
       },
     })
   }
@@ -59,16 +59,15 @@ export class AcrossAdapter extends BaseSwapAdapter {
   }
   getSupportedChains(): Chain[] {
     return [
-      ChainId.MAINNET,
-      ChainId.ARBITRUM,
-      ChainId.OPTIMISM,
-      ChainId.LINEA,
-      ChainId.MATIC,
-      ChainId.ZKSYNC,
-      ChainId.BASE,
-      ChainId.SCROLL,
-      ChainId.BLAST,
-      ChainId.UNICHAIN,
+      ChainId.ETH,
+      ChainId.ARB,
+      ChainId.OPT,
+      ChainId.LNA,
+      ChainId.POL,
+      ChainId.BAS,
+      ChainId.SCL,
+      ChainId.BLS,
+      ChainId.UNI,
     ]
   }
 

package/src/cross/adapters/BaseSwapAdapter.ts

@@ -1,6 +1,6 @@
 import type { useWalletSelector } from '@near-wallet-selector/react-hook'
 import { ChainId } from '@openocean.finance/widget-sdk'
-import type { AdaptedWallet } from '@reservoir0x/relay-sdk'
+// import type { AdaptedWallet } from '@relayprotocol/relay-sdk'
 import type { WalletAdapterProps } from '@solana/wallet-adapter-base'
 import type { Connection } from '@solana/web3.js'
 import type { WalletClient } from 'viem'
@@ -14,10 +14,14 @@ import type {
 import type { Quote } from '../registry.js'
 
 export enum NonEvmChain {
-  Near = 'near',
+  Near = 20000000000006,
   Bitcoin = 20000000000001,
   Solana = 1151111081099710,
+}
+
+export enum NewEvmChain {
   Plasma = 9745,
+  Monad = 143,
 }
 
 export const BitcoinToken = {
@@ -27,7 +31,7 @@ export const BitcoinToken = {
   logo: 'https://storage.googleapis.com/ks-setting-1d682dca/285205e7-a16d-421c-a794-67439cd6b54f1751515894455.png',
 }
 
-export type Chain = ChainId | NonEvmChain
+export type Chain = ChainId | NonEvmChain | NewEvmChain
 export type Currency =
   | EvmCurrency
   | NearToken
@@ -49,12 +53,22 @@ export const NonEvmChainInfo: {
     name: 'Solana',
     icon: 'https://solana.com/favicon.png',
   },
-  [NonEvmChain.Plasma]: {
+}
+
+export const NewEvmChainInfo: {
+  [key in NewEvmChain]: { name: string; icon: string }
+} = {
+  [NewEvmChain.Plasma]: {
     name: 'Plasma',
     icon: 'https://storage.googleapis.com/ks-setting-1d682dca/285205e7-a16d-421c-a794-67439cd6b54f1751515894455.png',
   },
+  [NewEvmChain.Monad]: {
+    name: 'Monad',
+    icon: 'https://storage.googleapis.com/ks-setting-1d682dca/285205e7-a16d-421c-a794-67439cd6b54f1751515894455.png',
+  },
 }
 
+
 export const NOT_SUPPORTED_CHAINS_PRICE_SERVICE = [
   ChainId.FTM,
   ChainId.SCL,
@@ -64,7 +78,8 @@ export const NOT_SUPPORTED_CHAINS_PRICE_SERVICE = [
   NonEvmChain.Solana,
   NonEvmChain.Bitcoin,
   NonEvmChain.Near,
-  NonEvmChain.Plasma,
+  NewEvmChain.Plasma,
+  NewEvmChain.Monad,
 ]
 
 export interface QuoteParams {
@@ -75,12 +90,13 @@ export interface QuoteParams {
   toToken: Currency
   amount: string
   slippage: number
-  walletClient?: AdaptedWallet | WalletClient
+  walletClient?: WalletClient
   tokenInUsd: number
   tokenOutUsd: number
   sender: string
   recipient: string
   publicKey?: string
+  isNative: boolean
 }
 
 export interface EvmQuoteParams extends QuoteParams {
@@ -89,7 +105,7 @@ export interface EvmQuoteParams extends QuoteParams {
 }
 
 export interface NearQuoteParams extends QuoteParams {
-  nearTokens: NearToken[]
+  // nearTokens: NearToken[]
 }
 
 export interface NormalizedQuote {
@@ -111,7 +127,7 @@ export interface NormalizedQuote {
 
   rawQuote: any
 
-  protocolFee: number
+  protocolFee: string | number
   protocolFeeString?: string
   platformFeePercent: number
 }

package/src/cross/adapters/DebridgeAdapter.ts

@@ -107,7 +107,7 @@ export class DeBridgeAdapter extends BaseSwapAdapter {
     let p: Record<string, string | boolean | number> = {
       srcChainId: mappingChainId[params.fromChain] || params.fromChain,
       srcChainTokenIn:
-        params.fromChain === 'solana'
+        params.fromChain === 1151111081099710
           ? (params.fromToken as SolanaToken).id
           : fromToken.isNative
             ? ZERO_ADDRESS
@@ -117,7 +117,7 @@ export class DeBridgeAdapter extends BaseSwapAdapter {
 
       dstChainId: mappingChainId[params.toChain] || params.toChain,
       dstChainTokenOut:
-        params.toChain === 'solana'
+        params.toChain === 1151111081099710
           ? (params.toToken as SolanaToken).id
           : toToken.isNative
             ? ZERO_ADDRESS
@@ -131,7 +131,7 @@ export class DeBridgeAdapter extends BaseSwapAdapter {
       referralCode: 31982,
       affiliateFeePercent: (params.feeBps * 100) / 10_000,
       affiliateFeeRecipient:
-        params.fromChain === 'solana'
+        params.fromChain === 1151111081099710
           ? CROSS_CHAIN_FEE_RECEIVER_SOLANA
           : CROSS_CHAIN_FEE_RECEIVER,
     }
@@ -202,16 +202,15 @@ export class DeBridgeAdapter extends BaseSwapAdapter {
       })
 
     const nativeDecimals =
-      params.fromChain === 'solana'
+      params.fromChain === 1151111081099710
         ? 9
         : NativeCurrencies[params.fromChain as ChainId].decimals
     const protocolFee =
       Number(nativePrice) * (Number(fixFee) / 10 ** nativeDecimals)
-    const protocolFeeString = `${Number(fixFee) / 10 ** nativeDecimals} ${
-      params.fromChain === 'solana'
-        ? 'SOL'
-        : NativeCurrencies[params.fromChain as ChainId].symbol
-    }`
+    const protocolFeeString = `${Number(fixFee) / 10 ** nativeDecimals} ${params.fromChain === 1151111081099710
+      ? 'SOL'
+      : NativeCurrencies[params.fromChain as ChainId].symbol
+      }`
 
     return {
       quoteParams: params,
@@ -250,7 +249,7 @@ export class DeBridgeAdapter 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 txBuffer = Buffer.from(quote.rawQuote.tx.data.slice(2), 'hex')
@@ -343,10 +342,11 @@ export class DeBridgeAdapter extends BaseSwapAdapter {
 
     const tx = await walletClient.sendTransaction({
       chain: undefined,
-      account,
+      account: account as `0x${string}`,
       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/LifiAdapter.ts

@@ -41,23 +41,23 @@ export class LifiAdapter extends BaseSwapAdapter {
 
   async getQuote(params: QuoteParams): Promise<NormalizedQuote> {
     const r = await getQuote({
-      fromChain: params.fromChain === 'solana' ? 'SOL' : +params.fromChain, // Arbitrum
+      fromChain: params.fromChain === 1151111081099710 ? 'SOL' : +params.fromChain, // Arbitrum
       fromToken:
-        params.fromChain === 'solana'
+        params.fromChain === 1151111081099710
           ? (params.fromToken as SolanaToken).id
           : (params.fromToken as any).isNative
-          ? ZERO_ADDRESS
-          : (params.fromToken as any).wrapped.address,
+            ? ZERO_ADDRESS
+            : (params.fromToken as any).wrapped.address,
       fromAmount: params.amount,
       fromAddress: params.sender === ZERO_ADDRESS ? CROSS_CHAIN_FEE_RECEIVER : params.sender,
 
-      toChain: params.toChain === 'solana' ? 'SOL' : +params.toChain,
+      toChain: params.toChain === 1151111081099710 ? 'SOL' : +params.toChain,
       toToken:
-        params.toChain === 'solana'
+        params.toChain === 1151111081099710
           ? (params.toToken as SolanaToken).id
           : (params.toToken as any).isNative
-          ? ZERO_ADDRESS
-          : (params.toToken as any).wrapped.address,
+            ? ZERO_ADDRESS
+            : (params.toToken as any).wrapped.address,
       toAddress: params.recipient,
       fee: params.feeBps / 10_000,
     })
@@ -181,6 +181,7 @@ export class LifiAdapter extends BaseSwapAdapter {
       to: quote.rawQuote.transactionRequest.to,
       value: BigInt(quote.rawQuote.transactionRequest.value),
       data: quote.rawQuote.transactionRequest.data,
+      kzg: undefined,
     })
 
     return {
@@ -200,8 +201,8 @@ export class LifiAdapter extends BaseSwapAdapter {
 
   async getTransactionStatus(p: NormalizedTxResponse): Promise<SwapStatus> {
     const res = await getStatus({
-      fromChain: p.sourceChain === 'solana' ? 'SOL' : +p.sourceChain,
-      toChain: p.targetChain === 'solana' ? 'SOL' : +p.targetChain,
+      fromChain: p.sourceChain === 1151111081099710 ? 'SOL' : +p.sourceChain,
+      toChain: p.targetChain === 1151111081099710 ? 'SOL' : +p.targetChain,
       txHash: p.sourceTxHash,
     })
 

package/src/cross/adapters/MayanAdapter.ts

@@ -110,7 +110,7 @@ export class MayanAdapter extends BaseSwapAdapter {
       contractAddress: addresses.MAYAN_FORWARDER_CONTRACT,
       rawQuote: quotes[0],
 
-      protocolFee: quotes[0].clientRelayerFeeSuccess,
+      protocolFee: quotes[0].clientRelayerFeeSuccess || 0,
       platformFeePercent: (params.feeBps * 100) / 10_000,
     }
   }
@@ -142,7 +142,6 @@ export class MayanAdapter extends BaseSwapAdapter {
       //   slippageBps: quote.quoteParams.slippage,
       //   referrerAddress: CROSS_CHAIN_FEE_RECEIVER,
       // })
-      // debugger
     } else {
       const res = getSwapFromEvmTxPayload(
         quote.rawQuote as MayanQuote,