@openocean.finance/widget 1.0.43 → 1.0.45

package/src/cross/adapters/NearIntentsAdapter.ts

@@ -30,14 +30,15 @@ import {
 export const MappingChainIdToBlockChain: Record<string, string> = {
   [NonEvmChain.Bitcoin]: 'btc',
   [NonEvmChain.Solana]: 'sol',
-  [ChainId.MAINNET]: 'eth',
-  [ChainId.ARBITRUM]: 'arb',
-  [ChainId.BSCMAINNET]: 'bsc',
-  [ChainId.BERA]: 'bera',
-  [ChainId.MATIC]: 'pol',
-  [ChainId.BASE]: 'base',
+  [ChainId.ETH]: 'eth',
+  [ChainId.ARB]: 'arb',
+  [ChainId.BSC]: 'bsc',
+  [ChainId.ERA]: 'bera',
+  [ChainId.POL]: 'pol',
+  [ChainId.BAS]: 'base',
+  [ChainId.NEAR]: 'near',
+  [ChainId.MONAD]: 'monad',
 }
-
 const erc20Abi = [
   {
     inputs: [
@@ -51,13 +52,80 @@ const erc20Abi = [
   },
 ]
 
+export interface NearToken {
+  assetId: string
+  decimals: number
+  blockchain: string
+  symbol: string
+  price: number
+  priceUpdatedAt: number
+  contractAddress: string
+  logo: string
+}
+const getTokenLogoUrl = (token: NearToken) => {
+  const { symbol, contractAddress } = token
+
+  // For major tokens without contract addresses or as fallbacks
+  switch (symbol) {
+    case 'ETH':
+      return 'https://assets.coingecko.com/coins/images/279/small/ethereum.png'
+    case 'BTC':
+    case 'wBTC':
+      return 'https://assets.coingecko.com/coins/images/1/small/bitcoin.png'
+    case 'USDC':
+      return 'https://assets.coingecko.com/coins/images/6319/small/USD_Coin_icon.png'
+    case 'USDT':
+      return 'https://assets.coingecko.com/coins/images/325/small/Tether.png'
+    case 'DAI':
+      return 'https://assets.coingecko.com/coins/images/9956/small/4943.png'
+    case 'SOL':
+      return 'https://assets.coingecko.com/coins/images/4128/small/solana.png'
+    case 'NEAR':
+    case 'wNEAR':
+      return 'https://assets.coingecko.com/coins/images/10365/small/near.jpg'
+    case 'BNB':
+      return 'https://assets.coingecko.com/coins/images/825/small/bnb-icon2_2x.png'
+    case 'DOGE':
+      return 'https://assets.coingecko.com/coins/images/5/small/dogecoin.png'
+    case 'XRP':
+      return 'https://assets.coingecko.com/coins/images/44/small/xrp-symbol-white-128.png'
+    case 'TRX':
+      return 'https://assets.coingecko.com/coins/images/1094/small/tron-logo.png'
+    case 'FRAX':
+      return 'https://assets.coingecko.com/coins/images/13422/small/FRAX_icon.png'
+    case 'LINK':
+      return 'https://assets.coingecko.com/coins/images/877/small/chainlink-new-logo.png'
+    case 'UNI':
+      return 'https://assets.coingecko.com/coins/images/12504/small/uni.jpg'
+    case 'AAVE':
+      return 'https://assets.coingecko.com/coins/images/12645/small/AAVE.png'
+    case 'SHIB':
+      return 'https://assets.coingecko.com/coins/images/11939/small/shiba.png'
+    case 'PEPE':
+      return 'https://assets.coingecko.com/coins/images/29850/small/pepe-token.jpeg'
+    case 'REF':
+      return 'https://s2.coinmarketcap.com/static/img/coins/64x64/11809.png'
+    case 'AURORA':
+      return 'https://s2.coinmarketcap.com/static/img/coins/64x64/14803.png'
+    case 'BLACKDRAGON':
+      return 'https://s2.coinmarketcap.com/static/img/coins/64x64/29627.png'
+    // Add more cases as needed
+    default:
+      // Fallback to a generic token icon
+      return `https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x${contractAddress}/logo.png`
+  }
+}
+
 export class NearIntentsAdapter extends BaseSwapAdapter {
+  private nearTokens: NearToken[] = []
   constructor() {
     super()
     // Initialize the API client
-    OpenAPI.BASE = 'https://1click.chaindefuser.com'
-    OpenAPI.TOKEN =
-      'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IjIwMjUtMDQtMjMtdjEifQ.eyJ2IjoxLCJrZXlfdHlwZSI6ImRpc3RyaWJ1dGlvbl9jaGFubmVsIiwicGFydG5lcl9pZCI6Imt5YmVyIiwiaWF0IjoxNzQ5MDQyNDk1LCJleHAiOjE3ODA1Nzg0OTV9.sC5g1Jn4BRIGXkIRmN4dnK2BzbIglLOVuOmnrTItGaAP-QU69lbyYs2QGPE-5c7dRC9Cc3s0ktO50W9VXiqQEefu-VCQTKtjsfIwfAm7wDC1XKUT7lbQL2uODqXxR6yg5d8ENu6p8F2t86_T8IEpid6b1yBidKladbs9tI2QebSp3Sn6bjtsnpD-9W2dsW0Gd6PUkpZizb--YqkmdPQ8Eu85fIxtDO64qbp0Xp6NY8caFEA1yakbwaMEUWXnNX6PB_elfH28sF0cMbqlyAGiHe98J8tZ47kga6e6yZP4UHoak3Y_eRNuX_CpwoXfULx1t8YLoSJEQuP9JsPIoyw5dA'
+    // OpenAPI.BASE = 'https://1click.chaindefuser.com'
+    OpenAPI.BASE = 'https://1click.openocean.finance'
+    if (this.nearTokens.length === 0) {
+      this.getAllSupportedTokens()
+    }
   }
 
   getName(): string {
@@ -75,62 +143,131 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
     ]
   }
 
+  async getAllSupportedTokens(): Promise<void> {
+    fetch(`https://1click.chaindefuser.com/v0/tokens`, {
+      headers: {
+        'Authorization': `Bearer ${OpenAPI.TOKEN}`,
+      },
+    })
+      .then(res => res.json())
+      .then(res => {
+        const wNear = res.find((token: NearToken) => token.contractAddress === 'wrap.near')
+
+        const native: NearToken = wNear
+          ? {
+            ...wNear,
+            symbol: 'NEAR',
+            contractAddress: '',
+            assetId: 'near',
+            logo: getTokenLogoUrl(wNear),
+          }
+          : {
+            assetId: 'near',
+            decimals: 24,
+            blockchain: 'near',
+            symbol: 'NEAR',
+            price: 0,
+            priceUpdatedAt: 0,
+            contractAddress: '',
+            logo: getTokenLogoUrl(wNear),
+          }
+
+        this.nearTokens = [
+          native,
+          ...(res?.map((item: NearToken) => {
+            if (item.blockchain == 'btc') {
+              console.log(item)
+            }
+            return {
+              ...item,
+              logo: getTokenLogoUrl(item),
+            }
+          }) || []),
+        ]
+        localStorage.setItem('nearTokens', JSON.stringify(this.nearTokens))
+      })
+      .catch(error => {
+        console.error('Failed to fetch near tokens:', error)
+        let nearTokens = localStorage.getItem('nearTokens')
+        if (nearTokens) {
+          this.nearTokens = JSON.parse(nearTokens)
+        } else {
+          this.nearTokens = []
+        }
+        // Reset loading state on error
+      })
+  }
+
   getSupportedTokens(_sourceChain: Chain, _destChain: Chain): Currency[] {
     return []
   }
 
   async getQuote(params: NearQuoteParams): Promise<NormalizedQuote> {
     const deadline = new Date()
-
     // 1 hour for Bitcoin, 20 minutes for other chains
     deadline.setSeconds(deadline.getSeconds() + (params.fromChain === NonEvmChain.Bitcoin ? 60 * 60 : 60 * 20))
+    if (this.nearTokens.length === 0) {
+      await this.getAllSupportedTokens()
+    }
 
-    const fromAssetId =
-      'assetId' in params.fromToken
-        ? params.fromToken.assetId === 'near'
-          ? 'nep141:wrap.near'
-          : params.fromToken.assetId
-        : params.nearTokens.find(token => {
-            const blockchain = MappingChainIdToBlockChain[params.fromChain as ChainId]
-
-            if (params.fromChain === 'solana')
-              return (params.fromToken as SolanaToken).id === SOLANA_NATIVE
-                ? token.symbol === 'SOL' && token.blockchain === 'sol'
-                : token.blockchain === blockchain && token.contractAddress === (params.fromToken as any).id
-
-            return (
-              token.blockchain === blockchain &&
-              ((params.fromToken as any).isNative
-                ? token.symbol.toLowerCase() === params.fromToken.symbol?.toLowerCase() &&
-                  token.assetId.includes('omft')
-                : token.contractAddress?.toLowerCase() === (params.fromToken as any).wrapped?.address.toLowerCase())
-            )
-          })?.assetId
-
-    const toAssetId =
-      'assetId' in params.toToken
-        ? params.toToken.assetId === 'near'
-          ? 'nep141:wrap.near'
-          : params.toToken.assetId
-        : params.nearTokens.find(token => {
-            const blockchain = MappingChainIdToBlockChain[params.toChain as ChainId]
-            if (params.toChain === 'solana')
-              return (params.toToken as SolanaToken).id === SOLANA_NATIVE
-                ? token.symbol === 'SOL' && token.blockchain === 'sol'
-                : token.blockchain === blockchain && token.contractAddress === (params.toToken as any).id
-
-            return (
-              token.blockchain === blockchain &&
-              ((params.toToken as any).isNative
-                ? token.symbol.toLowerCase() === params.toToken.symbol?.toLowerCase() && token.assetId.includes('omft')
-                : token.contractAddress?.toLowerCase() === (params.toToken as any).wrapped?.address.toLowerCase())
-            )
-          })?.assetId
+    let fromAssetId: any = ''
+    if ((params.fromToken as any).address === 'near.near') {
+      fromAssetId = 'nep141:wrap.near'
+    } else {
+      fromAssetId = this.nearTokens.find(token => {
+        const blockchain = MappingChainIdToBlockChain[params.fromChain as ChainId]
+
+        if (params.fromChain === 1151111081099710) {
+          return (params.fromToken as SolanaToken).address === SOLANA_NATIVE
+            ? token.symbol === 'SOL' && token.blockchain === 'sol'
+            : token.blockchain === blockchain && token.contractAddress === (params.fromToken as any).address
+        }
+        if (token.blockchain === blockchain) {
+          // console.log(token.symbol)
+          // console.log(token.assetId)
+          // console.log(token)
+          if (!token.contractAddress && (params.fromToken as any).isNative && token.symbol.toLowerCase() === params.fromToken.symbol?.toLowerCase()) {
+            return true
+          }
+          return token.contractAddress?.toLowerCase() === (params.fromToken as any).address.toLowerCase()
+        } else {
+          return false
+        }
+      })?.assetId
+    }
+
+    let toAssetId: any = ''
+    if ((params.toToken as any).address === 'near.near') {
+      toAssetId = 'nep141:wrap.near'
+    } else {
+      toAssetId = this.nearTokens.find((token: NearToken) => {
+        const blockchain = MappingChainIdToBlockChain[params.toChain as ChainId]
+        if (params.toChain === 1151111081099710) {
+          return (params.toToken as SolanaToken).address === SOLANA_NATIVE
+            ? token.symbol === 'SOL' && token.blockchain === 'sol'
+            : token.blockchain === blockchain && token.contractAddress === (params.toToken as any).address
+        }
 
-    if (!fromAssetId || !toAssetId) {
-      throw new Error('not supported tokens')
+        if (token.blockchain === blockchain) {
+          // console.log(token.symbol)
+          // console.log(token.assetId)
+          // console.log(token)
+          if (!token.contractAddress && (params.toToken as any).isNative && token.symbol.toLowerCase() === params.toToken.symbol?.toLowerCase()) {
+            return true
+          }
+          return token.contractAddress?.toLowerCase() === (params.toToken as any).address.toLowerCase()
+        } else {
+          return false
+        }
+      })?.assetId
     }
 
+    if (!fromAssetId) {
+      throw new Error('not supported from token')
+    }
+    if (!toAssetId) {
+      throw new Error('not supported to token')
+    }
     // Create a quote request
     const quoteRequest: QuoteRequest = {
       dry: true,
@@ -158,37 +295,47 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
       ],
     }
 
-    const quote = await OneClickService.getQuote(quoteRequest)
-    const formattedInputAmount = formatUnits(BigInt(params.amount), params.fromToken.decimals)
-    const formattedOutputAmount = formatUnits(BigInt(quote.quote.amountOut), params.toToken.decimals)
-    const inputUsd = +quote.quote.amountInUsd
-    const outputUsd = +quote.quote.amountOutUsd
-
-    return {
-      quoteParams: params,
-      outputAmount: BigInt(quote.quote.amountOut),
-      formattedOutputAmount,
-      inputUsd: +quote.quote.amountInUsd,
-      outputUsd: +quote.quote.amountOutUsd,
-      priceImpact: !inputUsd || !outputUsd ? NaN : ((inputUsd - outputUsd) * 100) / inputUsd,
-      rate: +formattedOutputAmount / +formattedInputAmount,
-      gasFeeUsd: 0,
-      timeEstimate: quote.quote.timeEstimate || 0,
-      // Near intent dont need to approve, we send token to contract directly
-      contractAddress: ZERO_ADDRESS,
-      rawQuote: quote,
-      protocolFee: 0,
-      platformFeePercent: (params.feeBps * 100) / 10_000,
+    try {
+      const quote = await OneClickService.getQuote(quoteRequest)
+      const formattedInputAmount = formatUnits(BigInt(params.amount), params.fromToken.decimals)
+      const rawAmountOut = Number(quote?.quote?.amountOut ?? 0)
+      const amountOut = rawAmountOut / 10 ** params.toToken.decimals
+      const formattedOutputAmount = amountOut.toString()
+      const inputUsd = Number(quote?.quote?.amountInUsd ?? 0)
+      const outputUsd = +quote.quote.amountOutUsd
+      const platformFeePercent = (params.feeBps * 100) / 10_000
+      const protocolFee = +quote.quote.amountInUsd * params.feeBps / 10000
+      return {
+        quoteParams: params,
+        outputAmount: BigInt(rawAmountOut),
+        formattedOutputAmount,
+        inputUsd: +quote.quote.amountInUsd,
+        outputUsd: +quote.quote.amountOutUsd,
+        priceImpact: !inputUsd || !outputUsd ? NaN : ((inputUsd - outputUsd) * 100) / inputUsd,
+        rate: +formattedOutputAmount / +formattedInputAmount,
+        gasFeeUsd: 0,
+        timeEstimate: quote.quote.timeEstimate || 0,
+        contractAddress: ZERO_ADDRESS,
+        rawQuote: quote,
+        protocolFee: protocolFee,
+        platformFeePercent: platformFeePercent,
+      }
+    } catch (error) {
+      // console.log('NearIntentsAdapter getQuote error', error)
+      if (error && typeof error === 'object' && 'body' in error) {
+        const errorWithBody = error as { body?: { message?: string } }
+        if (errorWithBody.body?.message) {
+          throw new Error(errorWithBody.body.message)
+        }
+      }
+      throw error
     }
   }
 
   async executeSwap(
     { quote }: Quote,
     walletClient: WalletClient,
-    nearWallet?: ReturnType<typeof useWalletSelector>,
-    sendBtcFn?: (params: { recipient: string; amount: string | number }) => Promise<string>,
-    sendSolanaFn?: WalletAdapterProps['sendTransaction'],
-    solanaConnection?: Connection,
+    nearWallet?: ReturnType<typeof useWalletSelector>
   ): Promise<NormalizedTxResponse> {
     const quoteParams = {
       ...quote.rawQuote.quoteRequest,
@@ -235,17 +382,28 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
 
     if (quote.quoteParams.fromChain === NonEvmChain.Solana) {
       return new Promise<NormalizedTxResponse>(async (resolve, reject) => {
-        if (!sendSolanaFn || !solanaConnection) {
-          reject('Not connected')
+        // Use walletClient (adaptedWallet) from ExecuteRoute.ts
+        const adaptedWallet = walletClient as any
+
+        if (!adaptedWallet || !adaptedWallet.sendTransaction) {
+          reject('Not connected or walletClient does not support sendTransaction')
+          return
+        }
+
+        // Get connection from adaptedWallet (exposed by ExecuteRoute.ts)
+        const connection = adaptedWallet.connection
+        if (!connection) {
+          reject('Connection not available from walletClient')
           return
         }
+
         const waitForConfirmation = async (txId: string) => {
           try {
-            const latestBlockhash = await solanaConnection.getLatestBlockhash()
+            const latestBlockhash = await connection.getLatestBlockhash()
 
             // Wait for confirmation with timeout
             const confirmation = await Promise.race([
-              solanaConnection.confirmTransaction(
+              connection.confirmTransaction(
                 {
                   signature: txId,
                   blockhash: latestBlockhash.blockhash,
@@ -268,9 +426,9 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
             console.error('Transaction confirmation failed:', confirmError)
 
             // Check if transaction actually succeeded despite timeout
-            const txStatus = await solanaConnection.getSignatureStatus(txId)
+            const txStatus = await connection.getSignatureStatus(txId)
             if (txStatus?.value?.confirmationStatus !== 'confirmed') {
-              throw new Error(`Transaction was not confirmed: ${confirmError.message}`)
+              throw new Error(`Transaction was not confirmed: ${confirmError instanceof Error ? confirmError.message : 'Unknown error'}`)
             }
           }
         }
@@ -279,11 +437,13 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
         const recipientPubkey = new PublicKey(depositAddress)
 
         const fromToken = quote.quoteParams.fromToken as SolanaToken
-
-        // const latestBlockhash = await solanaConnection.getLatestBlockhash('confirmed')
-
-        if (fromToken.id === SOLANA_NATIVE) {
-          const transaction = new Transaction().add(
+        if (fromToken.address === SOLANA_NATIVE) {
+          // Get latest blockhash before creating transaction
+          const { blockhash } = await connection.getLatestBlockhash('confirmed')
+          const transaction = new Transaction({
+            recentBlockhash: blockhash,
+            feePayer: fromPubkey,
+          }).add(
             SystemProgram.transfer({
               fromPubkey: fromPubkey,
               toPubkey: recipientPubkey,
@@ -291,7 +451,9 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
             }),
           )
           try {
-            const signature = await sendSolanaFn(transaction, solanaConnection)
+            // Use adaptedWallet.sendTransaction (exposed by ExecuteRoute.ts)
+            const result = await adaptedWallet.sendTransaction(transaction)
+            const signature = result?.signature || result
             await waitForConfirmation(signature)
 
             resolve({
@@ -302,7 +464,7 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
             reject(error)
           }
         } else {
-          const mintPubkey = new PublicKey(fromToken.id)
+          const mintPubkey = new PublicKey(fromToken.address)
           // Get associated token addresses
           const senderTokenAddress = await getAssociatedTokenAddress(
             mintPubkey,
@@ -318,11 +480,17 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
             TOKEN_PROGRAM_ID,
             ASSOCIATED_TOKEN_PROGRAM_ID,
           )
-          const transaction = new Transaction()
+
+          // Get latest blockhash before creating transaction
+          const { blockhash } = await connection.getLatestBlockhash('confirmed')
+          const transaction = new Transaction({
+            recentBlockhash: blockhash,
+            feePayer: fromPubkey,
+          })
 
           try {
             // Check if recipient's token account exists
-            await getAccount(solanaConnection, recipientTokenAddress)
+            await getAccount(connection, recipientTokenAddress)
           } catch (err) {
             // Account doesn't exist, create it
             console.log('Creating recipient token account...')
@@ -351,7 +519,9 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
           )
 
           try {
-            const signature = await sendSolanaFn(transaction, solanaConnection)
+            // Use adaptedWallet.sendTransaction (exposed by ExecuteRoute.ts)
+            const result = await adaptedWallet.sendTransaction(transaction)
+            const signature = result?.signature || result
             await waitForConfirmation(signature)
 
             resolve({
@@ -368,15 +538,18 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
 
     if (quote.quoteParams.fromChain === NonEvmChain.Bitcoin) {
       return new Promise<NormalizedTxResponse>(async (resolve, reject) => {
-        if (!sendBtcFn) {
+        if (!walletClient || !walletClient.sendTransaction) {
           reject('Not connected')
           return
         }
 
         try {
-          const tx = await sendBtcFn({
+          const tx = await walletClient.sendTransaction({
             recipient: depositAddress,
             amount: quote.quoteParams.amount,
+            chain: undefined,
+            account: walletClient.account?.address as `0x${string}`,
+            kzg: undefined,
           })
           await OneClickService.submitDepositTx({
             txHash: tx,
@@ -428,23 +601,23 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
           actions: [
             isNative
               ? {
-                  type: 'Transfer',
-                  params: {
-                    deposit: quote.quoteParams.amount,
-                  },
-                }
+                type: 'Transfer',
+                params: {
+                  deposit: quote.quoteParams.amount,
+                },
+              }
               : {
-                  type: 'FunctionCall',
-                  params: {
-                    methodName: 'ft_transfer',
-                    args: {
-                      receiver_id: depositAddress,
-                      amount: quote.quoteParams.amount,
-                    },
-                    gas: '30000000000000',
-                    deposit: '1',
+                type: 'FunctionCall',
+                params: {
+                  methodName: 'ft_transfer',
+                  args: {
+                    receiver_id: depositAddress,
+                    amount: quote.quoteParams.amount,
                   },
+                  gas: '30000000000000',
+                  deposit: '1',
                 },
+              },
           ],
         })
 
@@ -489,21 +662,22 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
 
         const hash = await ((fromToken as any).isNative
           ? walletClient.sendTransaction({
-              to: depositAddress as `0x${string}`,
-              value: BigInt(quote.quoteParams.amount),
-              chain: undefined,
-              account,
-            })
+            to: depositAddress as `0x${string}`,
+            value: BigInt(quote.quoteParams.amount),
+            chain: undefined,
+            account,
+            kzg: undefined
+          })
           : walletClient.writeContract({
-              address: ('contractAddress' in fromToken
-                ? fromToken.contractAddress
-                : (fromToken as any).wrapped.address) as `0x${string}`,
-              abi: erc20Abi,
-              functionName: 'transfer',
-              args: [depositAddress, quote.quoteParams.amount],
-              chain: undefined,
-              account,
-            }))
+            address: ('contractAddress' in fromToken
+              ? fromToken.contractAddress
+              : (fromToken as any).address) as `0x${string}`,
+            abi: erc20Abi,
+            functionName: 'transfer',
+            args: [depositAddress, quote.quoteParams.amount],
+            chain: undefined,
+            account,
+          }))
         await OneClickService.submitDepositTx({
           txHash: hash,
           depositAddress,
@@ -530,10 +704,10 @@ export class NearIntentsAdapter extends BaseSwapAdapter {
         res.status === 'SUCCESS'
           ? 'Success'
           : res.status === 'FAILED'
-          ? 'Failed'
-          : res.status === 'REFUNDED'
-          ? 'Refunded'
-          : 'Processing',
+            ? 'Failed'
+            : res.status === 'REFUNDED'
+              ? 'Refunded'
+              : 'Processing',
     }
   }
 }

package/src/cross/adapters/OptimexAdapter.ts

@@ -59,7 +59,7 @@ export class OptimexAdapter extends BaseSwapAdapter {
     return 'https://storage.googleapis.com/ks-setting-1d682dca/464ce79e-a906-4590-bf78-9054e606aa041749023419612.png'
   }
   getSupportedChains(): Chain[] {
-    return [NonEvmChain.Bitcoin, ChainId.MAINNET]
+    return [NonEvmChain.Bitcoin, ChainId.ETH]
   }
 
   getSupportedTokens(_sourceChain: Chain, _destChain: Chain): Currency[] {
@@ -76,17 +76,17 @@ export class OptimexAdapter extends BaseSwapAdapter {
     const fromToken = isFromBtc
       ? { token_id: 'BTC', token_symbol: 'BTC' }
       : this.tokens.find(item => {
-          const address = (params.fromToken as any).isNative ? 'native' : (params.fromToken as any).wrapped.address
-          return item.network_id === 'ethereum' && address.toLowerCase() === item.token_address.toLowerCase()
-        })
+        const address = (params.fromToken as any).isNative ? 'native' : (params.fromToken as any).wrapped.address
+        return item.network_id === 'ethereum' && address.toLowerCase() === item.token_address.toLowerCase()
+      })
     const fromTokenId = fromToken?.token_id
 
     const toToken = isToBtc
       ? { token_id: 'BTC', token_symbol: 'BTC' }
       : this.tokens.find(item => {
-          const address = (params.toToken as any).isNative ? 'native' : (params.toToken as any).wrapped.address
-          return item.network_id === 'ethereum' && address.toLowerCase() === item.token_address.toLowerCase()
-        })
+        const address = (params.toToken as any).isNative ? 'native' : (params.toToken as any).wrapped.address
+        return item.network_id === 'ethereum' && address.toLowerCase() === item.token_address.toLowerCase()
+      })
     const toTokenId = toToken?.token_id
 
     if (!fromTokenId || !toTokenId) {
@@ -237,6 +237,7 @@ export class OptimexAdapter extends BaseSwapAdapter {
       data: quote.rawQuote.txData.payload,
       chain: undefined,
       account,
+      kzg: undefined,
     })
 
     await fetch(`${OPTIMEX_API}/trades/${quote.rawQuote.txData.trade_id}/submit-tx`, {
@@ -264,10 +265,10 @@ export class OptimexAdapter extends BaseSwapAdapter {
       status: ['Done', 'PaymentConfirmed'].includes(res?.data?.state)
         ? 'Success'
         : ['Aborted', 'ToBeAborted', 'Failed', 'Failure', 'UserCancelled'].includes(res?.data?.state)
-        ? 'Failed'
-        : res?.data?.state === 'Refunded'
-        ? 'Refunded'
-        : 'Processing',
+          ? 'Failed'
+          : res?.data?.state === 'Refunded'
+            ? 'Refunded'
+            : 'Processing',
     }
   }
 }