Merge pull request #1459 from crypto-com/dev

Internal Release 1.5.1
crypto-com · Jul 30, 2024 · afb44b1 · afb44b1
2 parents caf10aa + e3aab49
commit afb44b1
Show file tree

Hide file tree

Showing 9 changed files with 252 additions and 148 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 ### Additions
 - Security enhancement
 - web3 library dependencies bump
+- Transit to upgraded indexing services
 ## [v1.5.0] - 2024-03-12
 ### Additions
 - Security enhancement on DApp Browser

diff --git a/src/config/StaticAssets.ts b/src/config/StaticAssets.ts
@@ -11,9 +11,9 @@ import { TestNetCroeseid5Config, MainNetConfig } from './StaticConfig';
 export const STATIC_ASSET_COUNT = 4;
 
 // Update Explorer Url - https://cronoscan.com
-export const MAINNET_EVM_EXPLORER_URL = 'https://cronoscan.com';
+export const MAINNET_EVM_EXPLORER_URL = 'https://explorer.cronos.org';
 // There's no testnet explorer on cronoscan.com. Use cronos.org/explorer instead.
-export const TESTNET_EVM_EXPLORER_URL = 'https://cronos.org/explorer/testnet3';
+export const TESTNET_EVM_EXPLORER_URL = 'https://explorer.cronos.org/testnet';
 
 export const MAINNET_ETHEREUM_EXPLORER_URL = 'https://etherscan.io';
 export const ROPSTEN_ETHEREUM_EXPLORER_URL = 'https://ropsten.etherscan.io';
@@ -235,8 +235,8 @@ export const ETH_ASSET = (walletConfig: WalletConfig) => {
 
     fee: { gasLimit: '50000', networkFee: '20000000000' },
     indexingUrl: isTestnet
-      ? 'https://eth-indexing.crypto.org/ethereum/goerli/api/v1'
-      : 'https://eth-indexing.crypto.org/ethereum/mainnet/api/v1',
+      ? 'https://eth-indexing.crypto.org/ethereum/goerli/api/v2'
+      : 'https://eth-indexing.crypto.org/ethereum/mainnet/api/v2',
     isLedgerSupportDisabled: false,
     isStakingDisabled: false,
     nodeUrl: isTestnet

diff --git a/src/layouts/home/home.tsx b/src/layouts/home/home.tsx
@@ -345,8 +345,6 @@ function HomeLayout(props: HomeLayoutProps) {
       : MAINNET_ETHEREUM_EXPLORER_URL;
 
     setTimeout(async () => {
-
-      console.log('checkCorrectExplorerUrl', cronosTendermintAsset?.config?.explorerUrl, checkDefaultCronosPosExplorerUrl);
       if (
         !walletSession.activeAsset?.config?.explorer ||
         // Check if explorerUrl has been updated with latest default

diff --git a/src/service/TransactionHistoryService.ts b/src/service/TransactionHistoryService.ts
@@ -40,6 +40,7 @@ import { croMarketPriceApi } from './rpc/MarketApi';
 import { CronosNftIndexingAPI } from './rpc/indexing/nft/cronos/CronosNftIndexingAPI';
 import {
   checkIfTestnet,
+  getAllERC20WhiteListedAddress,
   getCronosEvmAsset,
   isCRC20AssetWhitelisted,
   isERC20AssetWhitelisted,
@@ -334,18 +335,19 @@ export class TransactionHistoryService {
       const txList = await ethClient.getTxsByAddress(currentAsset.address);
 
       const loadedTxList = txList
-        .filter(
-          tx =>
-            tx.token_symbol === 'ETH' &&
-            (tx.type?.toLowerCase() === EthereumTransactionType.TRANSFER ||
-              tx.type?.toLowerCase() === EthereumTransactionType.UTF8TRANSFER),
-        )
+        // .filter(
+        //   tx =>
+        //     tx.method_id === ''
+        //     // tx.token_symbol === 'ETH' &&
+        //     // (tx.type?.toLowerCase() === EthereumTransactionType.TRANSFER ||
+        //     //   tx.type?.toLowerCase() === EthereumTransactionType.UTF8TRANSFER),
+        // )
         .map(tx => {
           const transferTx: TransferTransactionData = {
-            amount: tx.amount,
-            assetSymbol: tx.token_symbol,
+            amount: tx.value,
+            assetSymbol: 'ETH',
             date: new Date(Number(tx.timestamp) * 1000).toISOString(),
-            hash: tx.transaction_hash,
+            hash: tx.hash,
             memo: '',
             receiverAddress: tx.to,
             senderAddress: tx.from,
@@ -356,7 +358,7 @@ export class TransactionHistoryService {
             walletId: walletIdentifier,
             assetId: currentAsset.identifier,
             assetType: currentAsset.assetType,
-            txHash: tx.transaction_hash,
+            txHash: tx.hash,
             txType: EthereumTransactionType.TRANSFER,
             txData: transferTx,
             // TODO: add messageTypeName
@@ -860,9 +862,9 @@ export class TransactionHistoryService {
 
     const ethClient = new EthClient(ethEvmAsset.config?.nodeUrl, ethEvmAsset.config?.indexingUrl);
 
-    // const allWhiteListedTokens = getAllERC20WhiteListedAddress();
+    const allWhiteListedTokens = getAllERC20WhiteListedAddress();
     const tokensListResponse = await ethClient.getBalanceByAddress(address, {
-      // token: allWhiteListedTokens.slice(0, 20).join(','),
+      contract_addresses: allWhiteListedTokens.slice(0, 20).join(','),
     });
     const newlyLoadedTokens = await tokensListResponse
       .filter(token => token.balance > 0 && token.token_addr !== 'ETH')
@@ -941,9 +943,9 @@ export class TransactionHistoryService {
             if (asset.name.includes('Cronos')) {
               await this.fetchCurrentWalletCRC20Tokens(asset, currentSession);
             }
-            if (asset.name.includes('Ethereum')) {
-              await this.fetchCurrentWalletERC20Tokens(asset, currentSession);
-            }
+            // if (asset.name.includes('Ethereum')) {
+            //   await this.fetchCurrentWalletERC20Tokens(asset, currentSession);
+            // }
             break;
           default:
             break;

diff --git a/src/service/ethereum/EthClient.spec.ts b/src/service/ethereum/EthClient.spec.ts
diff --git a/src/service/ethereum/EthClient.ts b/src/service/ethereum/EthClient.ts
@@ -41,7 +41,7 @@ export class EthClient extends EVMClient implements IEthChainIndexAPI {
   getETHBalanceByAddress = async (address: string): Promise<string> => {
     const balanceResponse: AxiosResponse<BalancesByAddressResponse> = await axios({
       baseURL: this.indexingBaseUrl,
-      url: `/address/${address.toLowerCase()}/balance`,
+      url: `/addresses/${address.toLowerCase()}/native_balance`,
     });
 
     if (balanceResponse.status !== 200) {
@@ -62,7 +62,7 @@ export class EthClient extends EVMClient implements IEthChainIndexAPI {
   getBalanceByAddress = async (address: string, options?: balanceQueryBaseParams) => {
     const balanceResponse: AxiosResponse<BalancesByAddressResponse> = await axios({
       baseURL: this.indexingBaseUrl,
-      url: `/address/${address.toLowerCase()}/balance`,
+      url: `/addresses/${address.toLowerCase()}/token_balance`,
       params: { ...options },
     });
 
@@ -79,7 +79,7 @@ export class EthClient extends EVMClient implements IEthChainIndexAPI {
 
   getTxsByAddress = async (address: string, options?: txQueryBaseParams) => {
     // Pagination params
-    let currentPage = options?.page || 0;
+    let currentPage = options?.page || 1;
     const limit = options?.pageSize || 100;
 
     // Result
@@ -91,7 +91,6 @@ export class EthClient extends EVMClient implements IEthChainIndexAPI {
       const txDataList = await this.getTxsByAddressPaginated(address, {
         pageSize: limit,
         page: currentPage,
-        sort: 'timestamp:desc',
       });
 
       // Append TxData list to the final response array
@@ -111,7 +110,7 @@ export class EthClient extends EVMClient implements IEthChainIndexAPI {
   private getTxsByAddressPaginated = async (address: string, options?: txQueryBaseParams) => {
     const txListResponse: AxiosResponse<TransactionsByAddressResponse> = await axios({
       baseURL: this.indexingBaseUrl,
-      url: `/address/${address.toLowerCase()}/normal`,
+      url: `/addresses/${address.toLowerCase()}/transactions`,
       params: { ...options },
     });
 
@@ -134,4 +133,54 @@ export class EthClient extends EVMClient implements IEthChainIndexAPI {
   getInternalTxsByAddress(address: string, options?: any) {
     throw new Error('Method not implemented.');
   }
+
+
+  getERC20TransfersByAddress = async (address: string, options?: txQueryBaseParams) => {
+    // Pagination params
+    let currentPage = options?.page || 1;
+    const limit = options?.pageSize || 100;
+
+    // Result
+    const finalList: TransactionData[] = [];
+
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      // eslint-disable-next-line
+      const txDataList = await this.getERC20TransfersByAddressPaginated(address, {
+        pageSize: limit,
+        page: currentPage,
+        sort: 'timestamp:desc',
+      });
+
+      // Append TxData list to the final response array
+      finalList.push(...txDataList);
+
+      // Increment pagination params
+      currentPage += 1;
+
+      if (txDataList.length < 1 || txDataList.length < limit) {
+        break;
+      }
+    }
+
+    return finalList;
+  };
+
+  private getERC20TransfersByAddressPaginated = async (address: string, options?: txQueryBaseParams) => {
+    const txListResponse: AxiosResponse<TransactionsByAddressResponse> = await axios({
+      baseURL: this.indexingBaseUrl,
+      url: `/addresses/${address.toLowerCase()}/transfers`,
+      params: { ...options },
+    });
+
+    if (txListResponse.status !== 200) {
+      return [];
+    }
+
+    if (!txListResponse.data.data) {
+      return [];
+    }
+
+    return txListResponse.data.data as TransactionData[];
+  };
 }