@openocean.finance/widget 1.0.2 → 1.0.4

package/src/providers/WalletProvider/SDKProviders.tsx

@@ -1,7 +1,13 @@
 import { getConnectorClient as getBigmiConnectorClient } from '@bigmi/client'
 import { useConfig as useBigmiConfig } from '@bigmi/react'
-import type { SDKProvider } from '@lifi/sdk'
-import { ChainType, EVM, Solana, UTXO, config } from '@lifi/sdk'
+import type { SDKProvider } from '@openocean.finance/widget-sdk'
+import {
+  ChainType,
+  EVM,
+  Solana,
+  UTXO,
+  config,
+} from '@openocean.finance/widget-sdk'
 import type { SignerWalletAdapter } from '@solana/wallet-adapter-base'
 import { useWallet } from '@solana/wallet-adapter-react'
 import { useEffect } from 'react'

package/src/providers/WalletProvider/SVMProvider.tsx

@@ -1,4 +1,4 @@
-import { ChainType } from '@lifi/sdk'
+import { ChainType } from '@openocean.finance/widget-sdk'
 import { ConnectionContext } from '@solana/wallet-adapter-react'
 import { type FC, type PropsWithChildren, useContext } from 'react'
 import { isItemAllowed } from '../../utils/item.js'

package/src/providers/WalletProvider/UTXOProvider.tsx

@@ -1,5 +1,5 @@
 import { BigmiContext } from '@bigmi/react'
-import { ChainType } from '@lifi/sdk'
+import { ChainType } from '@openocean.finance/widget-sdk'
 import { type FC, type PropsWithChildren, useContext } from 'react'
 import { isItemAllowed } from '../../utils/item.js'
 import { useWidgetConfig } from '../WidgetProvider/WidgetProvider.js'

package/src/providers/WalletProvider/useExternalWalletProvider.ts

@@ -1,4 +1,4 @@
-import { ChainType } from '@lifi/sdk'
+import { ChainType } from '@openocean.finance/widget-sdk'
 import { useContext, useMemo } from 'react'
 import { useWidgetConfig } from '../WidgetProvider/WidgetProvider.js'
 import { EVMExternalContext } from './EVMExternalContext.js'

package/src/providers/WidgetProvider/WidgetProvider.tsx

@@ -1,5 +1,5 @@
-import type { SDKConfig } from '@lifi/sdk'
-import { config, createConfig } from '@lifi/sdk'
+import type { SDKConfig } from '@openocean.finance/widget-sdk'
+import { config, createConfig } from '@openocean.finance/widget-sdk'
 import { createContext, useContext, useId, useMemo } from 'react'
 import { version } from '../../config/version.js'
 import { useSettingsActions } from '../../stores/settings/useSettingsActions.js'

package/src/services/DebridgeService.ts

@@ -41,6 +41,32 @@ interface BuildSolanaBridgeDataParams {
 // Define mapping between chain IDs and Debridge internal chain IDs
 const DEBRIDGE_CHAIN_IDS: Record<number | string, string> = {
   1151111081099710: '7565164', // Solana
+  100: '100000002', // Gnosis Chain
+  42161: '42161', // Arbitrum
+  43114: '43114', // Avalanche
+  56: '56', // BNB Chain
+  1: '1', // Ethereum
+  137: '137', // Polygon
+  250: '250', // Fantom
+  59144: '59144', // Linea
+  10: '10', // Optimism
+  8453: '8453', // Base
+  245022934: '100000001', // Neon
+  1890: '100000003', // Lightlink (suspended)
+  1088: '100000004', // Metis
+  7171: '100000005', // Bitrock
+  4158: '100000006', // CrossFi
+  388: '100000010', // Cronos zkEVM
+  1514: '100000013', // Story
+  146: '100000014', // Sonic
+  48900: '100000015', // Zircuit
+  2741: '100000017', // Abstract
+  80094: '100000020', // Berachain
+  60808: '100000021', // BOB
+  999: '100000022', // HyperEVM
+  5000: '100000023', // Mantle
+  747: '100000009', // Flow
+  32769: '100000008', // Zilliqa
   // Other EVM chain IDs use numeric strings directly
 }
 
@@ -59,89 +85,6 @@ const NATIVE_TOKEN_ADDRESSES = [
   '', // Empty string might be used in some cases
 ].map((addr) => addr.toLowerCase())
 
-// Contract addresses and configurations
-const CONTRACT_CONFIG: Record<number, Record<string, any>> = {
-  56: {
-    // BSC
-    debridge: '0x...', // Supplement Debridge contract address
-    ooSwap: '0x22fefa40802E7aD7878FdE48700462e3f920E2C5',
-    bridgeId: { debridge: 22 /* Example ID */ },
-    messageBus: { debridge: '0x...' /* Example */ },
-    middlewareId: { ooSwap: 11 },
-  },
-  250: {
-    // Fantom
-    debridge: '0x...',
-    ooSwap: '0x521a8903B8D4C21b55768aE14f6cA31879B98d5e',
-    bridgeId: { debridge: 22 },
-    messageBus: { debridge: '0x...' },
-    middlewareId: { ooSwap: 5 },
-  },
-  137: {
-    // Polygon
-    debridge: '0x...',
-    ooSwap: '0x22fefa40802E7aD7878FdE48700462e3f920E2C5',
-    bridgeId: { debridge: 22 },
-    messageBus: { debridge: '0x...' },
-    middlewareId: { ooSwap: 7 },
-  },
-  43114: {
-    // Avalanche
-    debridge: '0x...',
-    ooSwap: '0x521a8903B8D4C21b55768aE14f6cA31879B98d5e',
-    bridgeId: { debridge: 22 },
-    messageBus: { debridge: '0x...' },
-    middlewareId: { ooSwap: 7 },
-  },
-  1: {
-    // Ethereum
-    debridge: '0x...',
-    ooSwap: '0xf951a9ea6b8400de7094d4b2b8d2ff2176d7ca81',
-    bridgeId: { debridge: 22 },
-    messageBus: { debridge: '0x...' },
-    middlewareId: { ooSwap: 11 },
-  },
-  42161: {
-    // Arbitrum
-    debridge: '0x65C757C04141a1602705F1F90260FEd66a86d0b8',
-    ooSwap: '0x900822ea09123b5583ef5ca8fd8ca542ea21699a',
-    bridgeId: { debridge: 22 },
-    messageBus: { debridge: '0x...' /* Needs supplement */ },
-    middlewareId: { ooSwap: 6 },
-  },
-  10: {
-    // Optimism
-    debridge: '0x...',
-    ooSwap: '0x521a8903B8D4C21b55768aE14f6cA31879B98d5e',
-    bridgeId: { debridge: 22 },
-    messageBus: { debridge: '0x...' },
-    middlewareId: { ooSwap: 2 },
-  },
-  324: {
-    // zkSync Era
-    debridge: '0x...',
-    ooSwap: '0xB6d35eE980Cde5e706C0866DF0122b076D26C44d',
-    bridgeId: { debridge: 22 },
-    messageBus: { debridge: '0x...' },
-    middlewareId: { ooSwap: 1 },
-  },
-  8453: {
-    // Base
-    debridge: '0x4045734fe21c7B7E0cE516BE009780Cc2BA39A8f',
-    // ooSwap: '...', // Base chain might not have ooSwap
-    bridgeId: { debridge: 3 },
-    messageBus: { debridge: '0x...' /* Needs supplement */ },
-    // middlewareId: {},
-  },
-  7565164: {
-    // Solana (Special handling)
-    debridge: '', // Solana might not need EVM address, but program ID
-    bridgeId: { debridge: -1 /* Placeholder */ },
-    messageBus: {},
-  },
-  // ... Add other chain Debridge configurations
-}
-
 // Native token information
 const NATIVE_TOKENS: Record<number, Asset> = {
   1: {
@@ -292,30 +235,6 @@ export class DebridgeService {
     return NATIVE_TOKENS[chainId]
   }
 
-  /**
-   * Get contract configuration information for specified chain and contract type
-   * @param chainId Chain ID
-   * @param contractType Contract type ('debridge', 'ooSwap', 'bridgeId', 'messageBus', 'middlewareId')
-   * @param subType Optional, for getting specific values under 'bridgeId', 'messageBus', 'middlewareId'
-   * @returns Configuration value or undefined
-   */
-  private static getContractConfig(
-    chainId: number,
-    contractType: string,
-    subType?: string
-  ): any {
-    const chainConfig = CONTRACT_CONFIG[chainId]
-    if (!chainConfig) {
-      console.warn(`No contract config found for chainId: ${chainId}`)
-      return undefined
-    }
-    const typeConfig = chainConfig[contractType]
-    if (subType) {
-      return typeConfig ? typeConfig[subType] : undefined
-    }
-    return typeConfig
-  }
-
   /**
    * Get Debridge internal chain ID
    * @param chainId Original chain ID

package/src/services/ExecuteRoute.ts

@@ -1,5 +1,10 @@
-import type { ExecutionStatus, LiFiStep, Process, Route } from '@lifi/sdk'
 import type { Account } from '@openocean.finance/wallet-management'
+import type {
+  ExecutionStatus,
+  OpenOceanStep,
+  Process,
+  Route,
+} from '@openocean.finance/widget-sdk'
 import { Connection, Transaction, VersionedTransaction } from '@solana/web3.js'
 import type { Config } from 'wagmi'
 import { getPublicClient, getWalletClient } from 'wagmi/actions'
@@ -22,7 +27,7 @@ interface ExecuteRouteOptions {
   onOpenWalletMenu?: () => void
 }
 
-interface ExtendedLiFiStep extends LiFiStep {
+interface ExtendedOpenOceanStep extends OpenOceanStep {
   execution?: {
     status: ExecutionStatus
     process: Process[]
@@ -33,7 +38,7 @@ interface ExtendedLiFiStep extends LiFiStep {
 }
 
 interface ExtendedRoute extends Route {
-  steps: ExtendedLiFiStep[]
+  steps: ExtendedOpenOceanStep[]
   data: {
     prependedOperatingExpenseCost: string
   }
@@ -41,7 +46,7 @@ interface ExtendedRoute extends Route {
 
 // Execute Solana transaction
 async function executeSolanaSwap(
-  step: ExtendedLiFiStep,
+  step: ExtendedOpenOceanStep,
   options: ExecuteRouteOptions,
   process: Process,
   route: ExtendedRoute
@@ -53,7 +58,9 @@ async function executeSolanaSwap(
     }
 
     let transaction: any = ''
-    let connection: any = null
+    const connection = new Connection(
+      'https://burned-practical-bird.solana-mainnet.quiknode.pro/33f4786133c252415e194b29ee69ffc7671480ab'
+    )
     const txData: any = step.transactionRequest?.data || ''
     const dexId = step.transactionRequest?.type || 0
     if (step.action.fromChainId === step.action.toChainId) {
@@ -64,10 +71,7 @@ async function executeSolanaSwap(
       }
     } else {
       transaction = VersionedTransaction.deserialize(hexToUint8Array(txData.slice(2)))
-      // Create connection instance
-      connection = new Connection(
-        'https://burned-practical-bird.solana-mainnet.quiknode.pro/33f4786133c252415e194b29ee69ffc7671480ab'
-      )
+
       const { blockhash } = await connection.getLatestBlockhash();
       transaction.message.recentBlockhash = blockhash;
     }
@@ -84,7 +88,6 @@ async function executeSolanaSwap(
       throw new Error('Failed to sign transaction')
     }
 
-
     // Serialize signed transaction
     const serializedTransaction = signedTx.serialize({
       verifySignatures: false,
@@ -136,24 +139,44 @@ async function executeSolanaSwap(
 
 // Execute EVM transaction
 async function executeEvmSwap(
-  step: ExtendedLiFiStep,
+  step: ExtendedOpenOceanStep,
   options: ExecuteRouteOptions,
   process: Process,
   route: ExtendedRoute
 ): Promise<void> {
   try {
     const walletClient = await getWalletClient(options.wagmiConfig)
+    
+    // Check if wallet is connected
     if (!walletClient) {
-      // If disconnect callback exists, disconnect the current connection first
       if (options.account?.connector && options.onDisconnect) {
         await options.onDisconnect(options.account)
       }
-      // Open wallet menu to let user reconnect
       if (options.onOpenWalletMenu) {
         options.onOpenWalletMenu()
       }
       throw new Error('Please connect wallet first')
     }
+    
+    // Check if current chain matches target chain
+    const currentChainId = walletClient.chain.id
+    const targetChainId = step.action.fromChainId
+    
+    if (currentChainId !== targetChainId) {
+      try {
+        // Try to switch to target chain
+        await walletClient.switchChain({ id: targetChainId })
+        
+        // Get updated walletClient after chain switch
+        const updatedWalletClient = await getWalletClient(options.wagmiConfig)
+        if (!updatedWalletClient || updatedWalletClient.chain.id !== targetChainId) {
+          throw new Error('Failed to switch chain')
+        }
+      } catch (error) {
+        console.error('Failed to switch chain:', error)
+        throw new Error(`Please manually switch to chain ID: ${targetChainId}`)
+      }
+    }
 
     const publicClient = getPublicClient(options.wagmiConfig)
     if (!publicClient) {
@@ -168,20 +191,24 @@ async function executeEvmSwap(
       throw new Error('Public client not found')
     }
 
-    console.log('Current Chain:', publicClient.chain?.id, publicClient.chain?.name);
-    console.log('Token Address:', step.action.fromToken.address);
-    console.log('Token Chain ID:', step.action.fromToken.chainId);
-    console.log('Owner Address:', walletClient.account.address);
-    console.log('Spender Address:', step.estimate.approvalAddress);
+    console.log(
+      'Current Chain:',
+      publicClient.chain?.id,
+      publicClient.chain?.name
+    )
+    console.log('Token Address:', step.action.fromToken.address)
+    console.log('Token Chain ID:', step.action.fromToken.chainId)
+    console.log('Owner Address:', walletClient.account.address)
+    console.log('Spender Address:', step.estimate.approvalAddress)
 
     // Check token approval
     if (
       step.action.fromToken.address !==
       '0x0000000000000000000000000000000000000000'
     ) {
-      let allowance: bigint = 0n;
+      let allowance = 0n
       try {
-          allowance = (await publicClient.readContract({
+        allowance = (await publicClient.readContract({
           address: step.action.fromToken.address as `0x${string}`,
           abi: [
             {
@@ -200,18 +227,20 @@ async function executeEvmSwap(
             walletClient.account.address,
             step.estimate.approvalAddress as `0x${string}`,
           ],
-        })) as bigint;
+        })) as bigint
       } catch (error) {
-        console.error("Failed to read allowance:", error);
+        console.error('Failed to read allowance:', error)
         // Log additional context
-        console.error("Context - Step:", JSON.stringify(step, null, 2));
-        console.error("Context - Route:", JSON.stringify(route, null, 2));
-        console.error("Context - Public Client Chain:", publicClient.chain);
+        console.error('Context - Step:', JSON.stringify(step, null, 2))
+        console.error('Context - Route:', JSON.stringify(route, null, 2))
+        console.error('Context - Public Client Chain:', publicClient.chain)
         // Re-throw the error or handle it appropriately
         // throw new Error(`Failed to read allowance for token ${step.action.fromToken.address}: ${error instanceof Error ? error.message : String(error)}`);
       }
 
-      const amount = BigInt(step.action.fromAmount) + BigInt(route?.data?.prependedOperatingExpenseCost || '0');
+      const amount =
+        BigInt(step.action.fromAmount) +
+        BigInt(route?.data?.prependedOperatingExpenseCost || '0')
       if (allowance < BigInt(amount)) {
         const approvalAmount = options.infiniteApproval
           ? BigInt(

package/src/stores/form/types.ts

@@ -1,4 +1,4 @@
-import type { ContractCall } from '@lifi/sdk'
+import type { ContractCall } from '@openocean.finance/widget-sdk'
 import type { StoreApi } from 'zustand'
 import type { UseBoundStoreWithEqualityFn } from 'zustand/traditional'
 

package/src/stores/routes/createRouteExecutionStore.ts

@@ -1,4 +1,4 @@
-import type { Route, RouteExtended } from '@lifi/sdk'
+import type { Route, RouteExtended } from '@openocean.finance/widget-sdk'
 import type { StateCreator } from 'zustand'
 import { persist } from 'zustand/middleware'
 import { createWithEqualityFn } from 'zustand/traditional'

package/src/stores/routes/types.ts

@@ -1,4 +1,4 @@
-import type { Route, RouteExtended } from '@lifi/sdk'
+import type { Route, RouteExtended } from '@openocean.finance/widget-sdk'
 
 export interface RouteExecution {
   route: RouteExtended

package/src/stores/routes/utils.ts

@@ -1,4 +1,4 @@
-import type { Process, RouteExtended } from '@lifi/sdk'
+import type { Process, RouteExtended } from '@openocean.finance/widget-sdk'
 import microdiff from 'microdiff'
 
 export const isRouteDone = (route: RouteExtended) => {

package/src/stores/settings/types.ts

@@ -1,4 +1,4 @@
-import type { Order } from '@lifi/sdk'
+import type { Order } from '@openocean.finance/widget-sdk'
 import type { PropsWithChildren } from 'react'
 import type { StoreApi } from 'zustand'
 import type { UseBoundStoreWithEqualityFn } from 'zustand/traditional'

package/src/types/events.ts

@@ -1,4 +1,9 @@
-import type { ChainId, ChainType, Process, Route } from '@lifi/sdk'
+import type {
+  ChainId,
+  ChainType,
+  Process,
+  Route,
+} from '@openocean.finance/widget-sdk'
 import type { DefaultValues } from '../stores/form/types.js'
 import type { SettingsProps } from '../stores/settings/types.js'
 import type { NavigationRouteType } from '../utils/navigationRoutes.js'

package/src/types/token.ts

@@ -1,4 +1,4 @@
-import type { TokenAmount as SDKTokenAmount } from '@lifi/sdk'
+import type { TokenAmount as SDKTokenAmount } from '@openocean.finance/widget-sdk'
 
 export interface TokenAmount extends SDKTokenAmount {
   featured?: boolean

package/src/types/widget.ts

@@ -1,13 +1,3 @@
-import type {
-  BaseToken,
-  ChainType,
-  ContractCall,
-  Order,
-  RouteOptions,
-  SDKConfig,
-  StaticToken,
-  Token,
-} from '@lifi/sdk'
 import type {
   Components,
   PaletteMode,
@@ -17,6 +7,16 @@ import type {
   Theme,
 } from '@mui/material'
 import type { TypographyOptions } from '@mui/material/styles/createTypography.js'
+import type {
+  BaseToken,
+  ChainType,
+  ContractCall,
+  Order,
+  RouteOptions,
+  SDKConfig,
+  StaticToken,
+  Token,
+} from '@openocean.finance/widget-sdk'
 import type {
   CSSProperties,
   MutableRefObject,

package/src/utils/chainType.ts

@@ -1,5 +1,5 @@
 import { isUTXOAddress } from '@bigmi/core'
-import { ChainId, ChainType, isSVMAddress } from '@lifi/sdk'
+import { ChainId, ChainType, isSVMAddress } from '@openocean.finance/widget-sdk'
 import { isAddress as isEVMAddress } from 'viem'
 
 const chainTypeAddressValidation = {

package/src/utils/converters.ts

@@ -7,7 +7,7 @@ import type {
   Substatus,
   TokenAmount,
   ToolsResponse,
-} from '@lifi/sdk'
+} from '@openocean.finance/widget-sdk'
 import type { RouteExecution } from '../stores/routes/types.js'
 import { formatTokenPrice } from './format.js'
 
@@ -146,7 +146,7 @@ export const buildRouteFromTxHistory = (
       steps: [
         {
           id: crypto.randomUUID(),
-          type: 'lifi',
+          type: 'openocean',
           tool: tx.tool,
           toolDetails: usedTool,
           action: {

package/src/utils/fees.ts

@@ -1,4 +1,9 @@
-import type { FeeCost, GasCost, RouteExtended, Token } from '@lifi/sdk'
+import type {
+  FeeCost,
+  GasCost,
+  RouteExtended,
+  Token,
+} from '@openocean.finance/widget-sdk'
 import { formatTokenPrice } from './format.js'
 
 export interface FeesBreakdown {

package/src/utils/getPriceImpact.ts

@@ -1,4 +1,4 @@
-import type { Token } from '@lifi/sdk'
+import type { Token } from '@openocean.finance/widget-sdk'
 import { formatTokenPrice } from './format.js'
 
 interface GetPriceImpractProps {