hot_fix: fix flow from orai to sol

src/helper/constants.ts

@@ -1,5 +1,5 @@
-import { defaultOraiToken } from '@oraichain/orai-token-inspector';
 import { ChainIdEnum } from '@oraichain/oraidex-common';
+import { TokenInfo } from '@oraichain/oraidex-contracts-sdk/build/OraiswapConverter.types';
 
 export const leapSnapId = 'npm:@leapwallet/metamask-cosmos-snap';
 export const leapWalletType = 'leapSnap';
@@ -24,3 +24,32 @@ export const RELAYER_DECIMAL = 6;
 export const DAY_IN_MILIS = 86400000;
 export const DEFAULT_TOKEN_ICON_URL =
   'https://raw.githubusercontent.com/cosmos/chain-registry/master/oraichain/images/orai-token.png';
+
+export type ConverterPairParams = {
+  from: TokenInfo;
+  to: TokenInfo;
+  isMintBurn: boolean;
+};
+
+export const CONVERTER_MIDDLEWARE: Partial<Record<string, ConverterPairParams>> = {
+  ['EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v']: {
+    from: {
+      decimals: 6,
+      info: {
+        native_token: {
+          denom:
+            'factory/orai1wuvhex9xqs3r539mvc6mtm7n20fcj3qr2m0y9khx6n5vtlngfzes3k0rq9/EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'
+        }
+      }
+    },
+    to: {
+      decimals: 6,
+      info: {
+        token: {
+          contract_addr: 'orai15un8msx3n5zf9ahlxmfeqd2kwa5wm0nrpxer304m9nd5q6qq0g6sku5pdd'
+        }
+      }
+    },
+    isMintBurn: false
+  }
+};

src/initCommon.ts

@@ -15,14 +15,62 @@ while (!oraidexCommonOg) {
 }
 export const oraidexCommon = oraidexCommonOg;
 
+export const usdcSolToken = {
+  name: 'USDC',
+  org: 'sol',
+  denom: 's20_usdc',
+  contractAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+  coinGeckoId: 'usd-coin',
+  decimals: 6,
+  description: 'USD Coin on Solana',
+  rpc: 'https://swr.xnftdata.com/rpc-proxy/',
+  chainId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+  cosmosBased: false,
+  gasPriceStep: {
+    low: 1,
+    average: 1.25,
+    high: 1.5
+  },
+  coinType: 501,
+  feeCurrencies: [
+    {
+      coinDenom: 'SOL',
+      coinMinimalDenom: 'sol',
+      coinDecimals: 9,
+      coinGeckoId: 'solana',
+      coinImageUrl: 'https://assets.coingecko.com/coins/images/4128/standard/solana.png?1718769756',
+      gasPriceStep: {
+        low: 1,
+        average: 1.25,
+        high: 1.5
+      }
+    }
+  ],
+  icon: 'https://statics.solscan.io/cdn/imgs/s60?ref=68747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f736f6c616e612d6c6162732f746f6b656e2d6c6973742f6d61696e2f6173736574732f6d61696e6e65742f45506a465764643541756671535371654d32714e31787a7962617043384734774547476b5a777954447431762f6c6f676f2e706e67',
+  iconLight:
+    'https://statics.solscan.io/cdn/imgs/s60?ref=68747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f736f6c616e612d6c6162732f746f6b656e2d6c6973742f6d61696e2f6173736574732f6d61696e6e65742f45506a465764643541756671535371654d32714e31787a7962617043384734774547476b5a777954447431762f6c6f676f2e706e67',
+  bridgeTo: ['Oraichain']
+};
+
 export const initializeOraidexCommon = async (
   dispatch: Dispatch<AnyAction>,
   allOraichainTokens: TokenItemType[],
   addedTokens: TokenItemType[]
 ) => {
-  const oraichainTokens = oraidexCommonOg.oraichainTokens;
+  let oraichainTokens = oraidexCommonOg.oraichainTokens;
   const otherChainTokens = oraidexCommonOg.otherChainTokens;
-
+  // Start Dev
+  otherChainTokens.push(usdcSolToken as any);
+  flattenTokens.push(usdcSolToken as any);
+  let usdcToken = oraichainTokens.find((token) => token.name === 'USDC');
+  usdcToken.bridgeTo.push('solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp');
+  oraichainTokens = oraichainTokens.map((token) => {
+    if (token.name !== 'USDC') {
+      return token;
+    }
+    return usdcToken;
+  });
+  // End Dev
   const allVerifiedOraichainTokens = allOraichainTokens.filter((token) => token.isVerified);
   if (arraysAreDifferent(oraichainTokens, allVerifiedOraichainTokens)) {
     dispatch(updateAllOraichainTokens([...oraichainTokens, ...addedTokens]));
@@ -63,6 +111,10 @@ export const {
   tonTokens
 } = oraidexCommon;
 
+// Start Dev
+otherChainTokens.push(usdcSolToken);
+// End Dev
+
 // FIXME: need remove when update chainInfo in oraichain-common sdk
 const IGNORE_CHAIN_IDS = new Set(['kawaii_6886-1', '0x1ae6']);
 const getFilteredChainInfos = (chainInfo) => chainInfo.filter((chain) => !IGNORE_CHAIN_IDS.has(chain.chainId));

src/pages/Balance/TransferConvertToken/index.tsx

@@ -159,6 +159,11 @@ const TransferConvertToken: FC<TransferConvertProps> = ({
     toToken,
     isMemeBridge
   });
+  console.log({
+    solFee,
+    isOraichainToSol,
+    isSolToOraichain
+  });
 
   const { deductNativeAmount, checkBalanceBridgeByNetwork } = useTonBridgeHandler({
     token,
@@ -171,6 +176,7 @@ const TransferConvertToken: FC<TransferConvertProps> = ({
   const isFromOraichainToBitcoin = token.chainId === 'Oraichain' && toNetworkChainId === ('bitcoin' as any);
   const isFromBitcoinToOraichain = token.chainId === ('bitcoin' as string) && toNetworkChainId === 'Oraichain';
   let { relayerFee: relayerFeeTokenFee } = useRelayerFeeToken(token, to);
+  relayerFeeTokenFee = to ? relayerFeeTokenFee : 0;
   const depositFeeBtcV2Result = useDepositFeesBitcoinV2(true);
   const withdrawalFeeBtcV2Result = useGetWithdrawlFeesBitcoinV2({
     enabled: isFromOraichainToBitcoin,

src/pages/Balance/index.tsx

@@ -7,9 +7,12 @@ import { AppBitcoinClient } from '@oraichain/bitcoin-bridge-contracts-sdk';
 import { NetworkChainId } from '@oraichain/common';
 import {
   calculateTimeoutTimestamp,
+  CONVERTER_CONTRACT,
   getTokenOnOraichain,
+  MIXED_ROUTER,
   ORAI,
   ORAI_SOL_CONTRACT_ADDRESS,
+  parseAssetInfo,
   parseTokenInfoRawDenom,
   solChainId,
   toAmount,
@@ -49,7 +52,8 @@ import {
   CWAppBitcoinContractAddress,
   CWBitcoinFactoryDenom,
   DEFAULT_RELAYER_FEE,
-  RELAYER_DECIMAL
+  RELAYER_DECIMAL,
+  CONVERTER_MIDDLEWARE
 } from 'helper/constants';
 import { useCoinGeckoPrices } from 'hooks/useCoingecko';
 import useConfigReducer from 'hooks/useConfigReducer';
@@ -62,7 +66,8 @@ import {
   flattenTokens,
   oraichainTokens as oraichainTokensCommon,
   oraidexCommon,
-  otherChainTokens as otherChainTokenCommon
+  otherChainTokens as otherChainTokenCommon,
+  usdcSolToken
 } from 'initCommon';
 import Content from 'layouts/Content';
 import Metamask from 'libs/metamask';
@@ -112,6 +117,9 @@ import { FallbackEmptyData } from 'components/FallbackEmptyData';
 import { getTokenInspectorInstance } from 'initTokenInspector';
 import { onChainTokenToTokenItem } from 'reducer/onchainTokens';
 import { addToOraichainTokens, addToOtherChainTokens } from 'reducer/token';
+import { parsePoolKey } from '@oraichain/oraiswap-v3';
+import { MsgExecuteContract } from 'cosmjs-types/cosmwasm/wasm/v1/tx';
+import { toUtf8 } from '@cosmjs/encoding';
 
 interface BalanceProps {}
 export const isMaintainBridge = false;
@@ -145,11 +153,15 @@ const Balance: React.FC<BalanceProps> = () => {
   const [loadingInspector, setLoadingInspector] = useState(false);
   const [toToken, setToToken] = useState<TokenItemType>();
   const [toTokens, setToTokens] = useState<any>();
-
   const [filterNetworkUI, setFilterNetworkUI] = useConfigReducer('filterNetwork');
   const [hideOtherSmallAmount, setHideOtherSmallAmount] = useConfigReducer('hideOtherSmallAmount');
   const [tokenPoolPrices] = useConfigReducer('tokenPoolPrices');
 
+  console.log({
+    oraichainTokens,
+    otherChainTokens,
+    toTokens
+  });
   const {
     metamaskAddress,
     address: oraiAddress,
@@ -212,6 +224,7 @@ const Balance: React.FC<BalanceProps> = () => {
   const { data: prices } = useCoinGeckoPrices();
 
   useGetFeeConfig();
+
   useEffect(() => {
     (async () => {
       try {
@@ -321,6 +334,10 @@ const Balance: React.FC<BalanceProps> = () => {
       }
 
       let toToken = toTokens?.[toNetworkChainId];
+      console.log({
+        toTokens,
+        toNetworkChainId
+      });
       if (!toToken) {
         toToken = findDefaultToToken(token);
       }
@@ -556,7 +573,6 @@ const Balance: React.FC<BalanceProps> = () => {
     if (!solAddress) {
       throw new Error('Please connect to Solana wallet');
     }
-
     const isMemeBridge = getStatusMemeBridge(fromToken);
     let receiverAddress = ORAICHAIN_RELAYER_ADDRESS_AGENTS;
     let solRelayer = SOL_RELAYER_ADDRESS_AGENTS;
@@ -589,23 +605,71 @@ const Balance: React.FC<BalanceProps> = () => {
         throw new Error(message);
       }
     }
-
-    const result = await window.client.sendTokens(
-      oraiAddress,
-      receiverAddress,
-      [
-        {
-          amount: toAmount(transferAmount, fromToken.decimals).toString(),
-          denom: fromToken.denom
+    const tokenMintPubkey = toToken.contractAddress!;
+    const converterMiddleware = CONVERTER_MIDDLEWARE?.[tokenMintPubkey];
+    const instructions = [];
+    if (converterMiddleware) {
+      const parsedFrom = parseAssetInfo(converterMiddleware.from.info);
+      const parsedTo = parseAssetInfo(converterMiddleware.to.info);
+      instructions.push({
+        typeUrl: '/cosmwasm.wasm.v1.MsgExecuteContract',
+        value: MsgExecuteContract.fromPartial({
+          sender: oraiAddress,
+          contract: parsedTo,
+          msg: toUtf8(
+            JSON.stringify({
+              send: {
+                contract: CONVERTER_CONTRACT,
+                amount: toAmount(transferAmount, converterMiddleware.to.decimals).toString(),
+                msg: toBinary({
+                  convert_reverse: {
+                    from: converterMiddleware.from.info
+                  }
+                })
+              }
+            })
+          )
+        })
+      });
+      instructions.push({
+        typeUrl: '/cosmos.bank.v1beta1.MsgSend',
+        value: {
+          fromAddress: oraiAddress,
+          toAddress: receiverAddress,
+          amount: [
+            {
+              amount: toAmount(transferAmount, converterMiddleware.from.decimals).toString(),
+              denom: parsedFrom
+            }
+          ]
         }
-      ],
-      'auto',
-      solAddress
-    );
+      });
+    } else {
+      instructions.push({
+        typeUrl: '/cosmos.bank.v1beta1.MsgSend',
+        value: {
+          fromAddress: oraiAddress,
+          toAddress: receiverAddress,
+          amount: [
+            {
+              amount: toAmount(transferAmount, fromToken.decimals).toString(),
+              denom: fromToken.denom
+            }
+          ]
+        }
+      });
+    }
 
-    if (result) {
-      displayToast(TToastType.TX_SUCCESSFUL, {
-        customLink: getTransactionUrl(fromToken.chainId, result.transactionHash)
+    try {
+      const result = await window.client.signAndBroadcast(oraiAddress, instructions, 'auto', solAddress);
+      if (result) {
+        displayToast(TToastType.TX_SUCCESSFUL, {
+          customLink: getTransactionUrl(fromToken.chainId, result.transactionHash)
+        });
+      }
+    } catch (err) {
+      displayToast(TToastType.TX_FAILED, {
+        message: err.message
       });
     }
   };