Merge pull request #1171 from oraidex/feat/connect-tron

Feat/connect tron

Author: marxeille

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

src/helper/index.tsx

@@ -50,33 +50,31 @@ export interface InfoError {
 }
 
 export type DecimalLike = string | number | bigint | BigDecimal;
-export const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));
-export const EVM_CHAIN_ID: NetworkChainId[] = evmChains.map((c) => c.chainId);
+export const sleep = (ms: number) => new Promise(r => setTimeout(r, ms));
+export const EVM_CHAIN_ID: NetworkChainId[] = evmChains.map(c => c.chainId);
 export const networks = chainInfosWithIcon.filter(
-  (c) => c.chainId !== ChainIdEnum.OraiBridge && c.chainId !== ('oraibtc-mainnet-1' as any) && c.chainId !== '0x1ae6'
+  c => c.chainId !== ChainIdEnum.OraiBridge && c.chainId !== ('oraibtc-mainnet-1' as any) && c.chainId !== '0x1ae6'
 );
 export const cosmosNetworks = chainInfos.filter(
-  (c) =>
-    c.networkType === 'cosmos' && c.chainId !== ChainIdEnum.OraiBridge && c.chainId !== ('oraibtc-mainnet-1' as any)
+  c => c.networkType === 'cosmos' && c.chainId !== ChainIdEnum.OraiBridge && c.chainId !== ('oraibtc-mainnet-1' as any)
 );
 
-export const bitcoinNetworks = chainInfos.filter((c) => c.chainId === bitcoinChainId);
+export const bitcoinNetworks = chainInfos.filter(c => c.chainId === bitcoinChainId);
 export const cosmosNetworksWithIcon = chainInfos.filter(
-  (c) =>
-    c.networkType === 'cosmos' && c.chainId !== ChainIdEnum.OraiBridge && c.chainId !== ('oraibtc-mainnet-1' as any)
+  c => c.networkType === 'cosmos' && c.chainId !== ChainIdEnum.OraiBridge && c.chainId !== ('oraibtc-mainnet-1' as any)
 );
 
-export const evmNetworksWithoutTron = chainInfos.filter((c) => c.networkType === 'evm' && c.chainId !== '0x2b6653dc');
+export const evmNetworksWithoutTron = chainInfos.filter(c => c.networkType === 'evm' && c.chainId !== '0x2b6653dc');
 export const evmNetworksIconWithoutTron = chainInfosWithIcon.filter(
-  (c) => c.networkType === 'evm' && c.chainId !== '0x2b6653dc'
+  c => c.networkType === 'evm' && c.chainId !== '0x2b6653dc'
 );
 
 // export const bitcoinNetworks = chainInfos.filter((c) => c.chainId === ChainIdEnum.Bitcoin);
-export const tronNetworks = chainInfos.filter((c) => c.chainId === '0x2b6653dc');
-export const tronNetworksWithIcon = chainInfosWithIcon.filter((c) => c.chainId === '0x2b6653dc');
-export const btcNetworksWithIcon = chainInfosWithIcon.filter((c) => c.chainId === bitcoinChainId);
-export const solanaNetworksWithIcon = chainInfosWithIcon.filter((c) => c.chainId === solChainId);
-export const tonNetworksWithIcon = chainInfosWithIcon.filter((c) => c.chainId === TonChainId);
+export const tronNetworks = chainInfos.filter(c => c.chainId === '0x2b6653dc');
+export const tronNetworksWithIcon = chainInfosWithIcon.filter(c => c.chainId === '0x2b6653dc');
+export const btcNetworksWithIcon = chainInfosWithIcon.filter(c => c.chainId === bitcoinChainId);
+export const solanaNetworksWithIcon = chainInfosWithIcon.filter(c => c.chainId === solChainId);
+export const tonNetworksWithIcon = chainInfosWithIcon.filter(c => c.chainId === TonChainId);
 
 export const filterChainBridge = (token: Tokens | TokenItemType, item: CustomChainInfo) => {
   const tokenCanBridgeTo = token.bridgeTo ?? ['Oraichain'];
@@ -95,7 +93,7 @@ export const getDenomEvm = (): EvmDenom => {
 };
 
 export const getSpecialCoingecko = (fromCoingecko: string, toCoingecko: string) => {
-  const isSpecialCoingecko = (coinGeckoId) =>
+  const isSpecialCoingecko = coinGeckoId =>
     ['kawaii-islands', 'milky-token', 'injective-protocol'].includes(coinGeckoId);
   const isSpecialFromCoingecko = isSpecialCoingecko(fromCoingecko);
   const isSpecialToCoingecko = isSpecialCoingecko(toCoingecko);
@@ -138,7 +136,7 @@ export const getAccountUrl = (account: string) => {
 export const getNetworkGasPrice = async (chainId): Promise<number> => {
   try {
     const chainInfosWithoutEndpoints = await window.Keplr?.getChainInfosWithoutEndpoints(chainId);
-    const findToken = chainInfosWithoutEndpoints.find((e) => e.chainId === chainId);
+    const findToken = chainInfosWithoutEndpoints.find(e => e.chainId === chainId);
     if (findToken) {
       return findToken.feeCurrencies[0].gasPriceStep.average;
     }
@@ -186,11 +184,11 @@ export const handleCheckWallet = async () => {
   }
 };
 
-export const handleCheckChainEvmWallet = async (fromChainId) => {
+export const handleCheckChainEvmWallet = async fromChainId => {
   const supportedChainIds = ['0x01', '0x38'];
 
   if (supportedChainIds.includes(fromChainId)) {
-    const fromChainInfo = evmChainInfos.find((evm) => Number(evm.chainId) === Number(fromChainId));
+    const fromChainInfo = evmChainInfos.find(evm => Number(evm.chainId) === Number(fromChainId));
     if (fromChainInfo) {
       try {
         await window.ethereumDapp.request({
@@ -242,7 +240,7 @@ const transferMsgError = (message: string, info?: InfoError) => {
     return `Your previous transaction has not been included in a block. Please wait until it is included before creating a new transaction!`;
 
   const network = info?.chainName
-    ? [...evmChains, ...cosmosChains].find((evm) => evm.chainId === info.chainName)?.chainName
+    ? [...evmChains, ...cosmosChains].find(evm => evm.chainId === info.chainName)?.chainName
     : '';
   if (message.includes('Insufficient funds to redeem voucher') || message.includes('checking balance channel ibc'))
     return `Insufficient ${info?.tokenName ?? ''} liquidity on ${network} Bridge`;
@@ -371,7 +369,11 @@ export const switchWalletTron = async (walletType: WalletType) => {
   } else {
     const { code, message = 'Tronlink is not ready' } = res;
     if (code !== 200) throw new Error(message);
-    tronAddress = window.tronWeb?.defaultAddress?.base58;
+    if (res?.base58) {
+      tronAddress = res.base58;
+    } else {
+      tronAddress = window.tronWeb?.defaultAddress?.base58;
+    }
   }
 
   if (!tronAddress) throw new Error(res?.message ?? 'Error get Tron address!');
@@ -396,10 +398,10 @@ export const isConnectSpecificNetwork = (status: string | null) => {
 export const getAddressTransferForEvm = async (walletByNetworks: WalletsByNetwork, network: CustomChainInfo) => {
   let address = '';
   if (network.chainId === EVM_CHAIN_ID_COMMON.TRON_CHAIN_ID) {
-    if (window.tronLinkDapp?.isOwallet) {
-      const accountTron: interfaceRequestTron = await window.tronLinkDapp.request({
-        method: 'tron_requestAccounts'
-      });
+    const accountTron: interfaceRequestTron = await window.tronLinkDapp.request({
+      method: 'tron_requestAccounts'
+    });
+    if (accountTron && accountTron.code === 200 && accountTron.base58) {
       address = accountTron.base58;
     } else {
       address = window?.tronWebDapp?.defaultAddress?.base58;
@@ -423,6 +425,7 @@ export const getAddressTransfer = async (network: CustomChainInfo, walletByNetwo
         toUserFriendlyAddress(window.Ton?.account?.address);
       // address = useTonAddress();
     } else if (network.networkType === 'evm' && isConnectSpecificNetwork(walletByNetworks.evm)) {
+      //here
       address = await getAddressTransferForEvm(walletByNetworks, network);
     } else if (network.networkType == 'svm' && isConnectSpecificNetwork(walletByNetworks.solana)) {
       let provider = window?.solana;
@@ -490,7 +493,7 @@ export const getChainSupported = async () => {
     }
   });
 };
-export const getAddressBySnap = async (chainId) => {
+export const getAddressBySnap = async chainId => {
   await window.Keplr.suggestChain(chainId);
   const rs = await getChainSupported();
   if (rs?.[chainId]) {
@@ -516,7 +519,7 @@ type ChainInfoWithoutIcons = Omit<CustomChainInfo, 'currencies' | 'Icon' | 'Icon
   currencies: Array<Omit<CustomChainInfo['currencies'][number], 'Icon' | 'IconLight'>>;
   bech32Config: Bech32Config;
 };
-const checkErrorObj = (info) => {
+const checkErrorObj = info => {
   if (info?.Icon && info?.IconLight) {
     const { Icon, IconLight, ...data } = info;
     return data;
@@ -531,16 +534,16 @@ const checkErrorObj = (info) => {
 };
 export const chainInfoWithoutIcon = (): ChainInfoWithoutIcons[] => {
   let chainInfoData = [...chainInfos];
-  return chainInfoData.map((info) => {
+  return chainInfoData.map(info => {
     const infoWithoutIcon = checkErrorObj(info);
 
-    const currenciesWithoutIcons = info.currencies.map((currency) => {
+    const currenciesWithoutIcons = info.currencies.map(currency => {
       const currencyWithoutIcons = checkErrorObj(currency);
       return currencyWithoutIcons;
     });
 
     const stakeCurrencyyWithoutIcons = checkErrorObj(info.stakeCurrency);
-    const feeCurrenciesWithoutIcons = info?.feeCurrencies?.map((feeCurrency) => {
+    const feeCurrenciesWithoutIcons = info?.feeCurrencies?.map(feeCurrency => {
       const feeCurrencyyWithoutIcon = checkErrorObj(feeCurrency);
 
       return feeCurrencyyWithoutIcon;
@@ -607,7 +610,7 @@ export interface GetIconInterface {
 export const minimize = (priceUsd: string) => {
   const regex = /^0\.0*(\d+)/;
   const match = priceUsd.match(regex);
-  const getSubscript = (num) => String.fromCharCode(0x2080 + num);
+  const getSubscript = num => String.fromCharCode(0x2080 + num);
 
   if (match) {
     const leadingZeros = match[0].length - match[1].length - 2;
@@ -649,7 +652,7 @@ export function formatMoney(num) {
 
 export const getIcon = ({ isLightTheme, type, chainId, coinGeckoId, width, height }: GetIconInterface) => {
   if (type === 'token') {
-    const tokenIcon = flattenTokens.find((token) => token.coinGeckoId === coinGeckoId);
+    const tokenIcon = flattenTokens.find(token => token.coinGeckoId === coinGeckoId);
     if (tokenIcon) {
       return isLightTheme ? (
         <img src={tokenIcon.iconLight} alt="" width={width} height={height} />
@@ -660,7 +663,7 @@ export const getIcon = ({ isLightTheme, type, chainId, coinGeckoId, width, heigh
 
     return <DefaultIcon />;
   } else {
-    const networkIcon = chainInfos.find((chain) => chain.chainId === chainId);
+    const networkIcon = chainInfos.find(chain => chain.chainId === chainId);
     if (networkIcon) {
       return isLightTheme ? (
         <img src={networkIcon.chainSymbolImageUrl} alt="" width={width} height={height} />
@@ -680,7 +683,7 @@ export const getIconWallet = () => {
 export const getIconToken = ({ isLightTheme, denom, width = 30, height = 30 }) => {
   const storage = store.getState();
   const allOraichainTokens = storage.token.allOraichainTokens || [];
-  const tokenIcon = allOraichainTokens.find((tokenWithIcon) =>
+  const tokenIcon = allOraichainTokens.find(tokenWithIcon =>
     [tokenWithIcon.contractAddress, tokenWithIcon.denom].includes(denom)
   );
   if (tokenIcon) {
@@ -765,7 +768,7 @@ export const inspectTokenFromOraiCommonApi = async (denoms: string[]): Promise<T
     if (response.status !== 200) throw new Error('Failed to fetch token list: ' + response.statusText);
 
     const inspectedTokens = await response.json();
-    const tokenItemTypes = inspectedTokens.map((info) => onChainTokenToTokenItem(info));
+    const tokenItemTypes = inspectedTokens.map(info => onChainTokenToTokenItem(info));
     return tokenItemTypes;
   } catch (error) {
     console.log('Error inspectTokenFromOraiCommonApi: ', error);