From fe425d90d39665ceaca7d6d5ca1b13e5369ebed5 Mon Sep 17 00:00:00 2001
From: Francisco Ramos <jscriptcoder@gmail.com>
Date: Mon, 5 Jun 2023 21:01:12 +0200
Subject: [PATCH] fix(bridge-ui): handle wrong bridge address (#13880)

Co-authored-by: dave | d1onys1us <13951458+d1onys1us@users.noreply.github.com>
---
 .../Transactions/Transaction.svelte           |  25 +-
 .../src/constants/__mocks__/envVars.ts        |  14 +-
 packages/bridge-ui/src/domain/relayerApi.ts   |   2 +
 .../src/relayer-api/RelayerAPIService.spec.ts | 188 +++++---
 .../src/relayer-api/RelayerAPIService.ts      |  43 +-
 .../src/relayer-api/__fixtures__/events.json  | 410 +++++++++++++-----
 6 files changed, 472 insertions(+), 210 deletions(-)

diff --git a/packages/bridge-ui/src/components/Transactions/Transaction.svelte b/packages/bridge-ui/src/components/Transactions/Transaction.svelte
index f93f35721e..569e38d180 100644
--- a/packages/bridge-ui/src/components/Transactions/Transaction.svelte
+++ b/packages/bridge-ui/src/components/Transactions/Transaction.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
-  import { Contract, ethers, type Transaction } from 'ethers';
+  import { UserRejectedRequestError } from '@wagmi/core';
+  import { Contract, errors, type Transaction,utils } from 'ethers';
   import { createEventDispatcher } from 'svelte';
   import { onDestroy, onMount } from 'svelte';
   import { ArrowTopRightOnSquare } from 'svelte-heros-v2';
   import { _ } from 'svelte-i18n';
-
+  
   import { bridges } from '../../bridge/bridges';
   import { chains } from '../../chain/chains';
   import { bridgeABI } from '../../constants/abi';
@@ -121,7 +122,7 @@
       // during their first bridge transaction to L2
       // TODO: estimate Claim transaction
       const userBalance = await $signer.getBalance('latest');
-      if (!userBalance.gt(ethers.utils.parseEther('0.0001'))) {
+      if (!userBalance.gt(utils.parseEther('0.0001'))) {
         // TODO: magic number 0.0001. Config?
         dispatch('insufficientBalance');
         return;
@@ -192,7 +193,8 @@
           true, // dismissible
         );
       } else if (
-        [error.code, error.cause?.code].includes(ethers.errors.ACTION_REJECTED)
+        error instanceof UserRejectedRequestError ||
+        [error.code, error.cause?.code].includes(errors.ACTION_REJECTED)
       ) {
         warningToast(`Transaction has been rejected.`);
       } else if (error.cause === 'pending_tx') {
@@ -270,7 +272,7 @@
           true, // dismissible
         );
       } else if (
-        [error.code, error.cause?.code].includes(ethers.errors.ACTION_REJECTED)
+        [error.code, error.cause?.code].includes(errors.ACTION_REJECTED)
       ) {
         warningToast(`Transaction has been rejected.`);
       } else if (error.cause === 'pending_tx') {
@@ -368,13 +370,12 @@
     <span class="ml-2 hidden md:inline-block">{txToChain.name}</span>
   </td>
   <td>
-    {isETHByMessage(transaction.message)
-      ? ethers.utils.formatEther(
-          transaction.message.depositValue.eq(0)
-            ? transaction.message.callValue.toString()
-            : transaction.message.depositValue,
-        )
-      : ethers.utils.formatUnits(transaction.amountInWei)}
+    {#if Boolean(transaction.message) && isETHByMessage(transaction.message)}
+      {@const { depositValue, callValue } = transaction.message}
+      {utils.formatEther(depositValue.eq(0) ? callValue : depositValue)}
+    {:else}
+      {utils.formatUnits(transaction.amountInWei)}
+    {/if}
     {transaction.symbol ?? 'ETH'}
   </td>
 
diff --git a/packages/bridge-ui/src/constants/__mocks__/envVars.ts b/packages/bridge-ui/src/constants/__mocks__/envVars.ts
index c29d2f0ad0..b598c65236 100644
--- a/packages/bridge-ui/src/constants/__mocks__/envVars.ts
+++ b/packages/bridge-ui/src/constants/__mocks__/envVars.ts
@@ -3,7 +3,7 @@ export const L1_RPC = 'https://l1rpc.internal.taiko.xyz';
 export const L1_TOKEN_VAULT_ADDRESS =
   '0xa85233C63b9Ee964Add6F2cffe00Fd84eb32338f';
 
-export const L1_BRIDGE_ADDRESS = '0x59b670e9fA9D0A427751Af201D676719a970857b';
+export const L1_BRIDGE_ADDRESS = '0xc6e7df5e7b4f2a278906862b61205850344d4e7d';
 
 export const L1_CROSS_CHAIN_SYNC_ADDRESS =
   '0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE';
@@ -13,28 +13,28 @@ export const L1_SIGNAL_SERVICE_ADDRESS =
 
 export const L1_CHAIN_ID = 31336;
 
-export const L1_CHAIN_NAME = 'Ethereum A3';
+export const L1_CHAIN_NAME = 'Ethereum';
 
 export const L1_EXPLORER_URL = 'https://l1explorer.internal.taiko.xyz';
 
 export const L2_RPC = 'https://l2rpc.internal.taiko.xyz';
 
 export const L2_TOKEN_VAULT_ADDRESS =
-  '0x0000777700000000000000000000000000000002';
+  '0x1000777700000000000000000000000000000002';
 
 export const L2_BRIDGE_ADDRESS =
   import.meta.env?.VITE_L2_BRIDGE_ADDRESS ??
-  '0x0000777700000000000000000000000000000004';
+  '0x1000777700000000000000000000000000000004';
 
 export const L2_CROSS_CHAIN_SYNC_ADDRESS =
-  '0x0000777700000000000000000000000000000001';
+  '0x1000777700000000000000000000000000000001';
 
 export const L2_SIGNAL_SERVICE_ADDRESS =
-  '0x0000777700000000000000000000000000000007';
+  '0x1000777700000000000000000000000000000007';
 
 export const L2_CHAIN_ID = 167001;
 
-export const L2_CHAIN_NAME = 'Taiko A3';
+export const L2_CHAIN_NAME = 'Taiko';
 
 export const L2_EXPLORER_URL = 'https://l2explorer.internal.taiko.xyz';
 
diff --git a/packages/bridge-ui/src/domain/relayerApi.ts b/packages/bridge-ui/src/domain/relayerApi.ts
index 831f3bf7f6..c2cba7f566 100644
--- a/packages/bridge-ui/src/domain/relayerApi.ts
+++ b/packages/bridge-ui/src/domain/relayerApi.ts
@@ -40,7 +40,9 @@ export type TransactionData = {
     Data: string;
   };
   Raw: {
+    address: Address;
     transactionHash: string;
+    transactionIndex: string;
   };
 };
 
diff --git a/packages/bridge-ui/src/relayer-api/RelayerAPIService.spec.ts b/packages/bridge-ui/src/relayer-api/RelayerAPIService.spec.ts
index 8e11b01dda..0ddd0f79f0 100644
--- a/packages/bridge-ui/src/relayer-api/RelayerAPIService.spec.ts
+++ b/packages/bridge-ui/src/relayer-api/RelayerAPIService.spec.ts
@@ -1,10 +1,16 @@
 import type { Address } from '@wagmi/core';
 import axios from 'axios';
-import type { ethers } from 'ethers';
-
-import { L1_CHAIN_ID, L2_CHAIN_ID, RELAYER_URL } from '../constants/envVars';
+import { ethers } from 'ethers';
+
+import {
+  L1_CHAIN_ID,
+  L2_BRIDGE_ADDRESS,
+  L2_CHAIN_ID,
+  RELAYER_URL,
+} from '../constants/envVars';
 import { MessageStatus } from '../domain/message';
 import type { ProvidersRecord } from '../domain/provider';
+import type { APIResponseTransaction } from '../domain/relayerApi';
 import blockInfoJson from './__fixtures__/blockInfo.json';
 import eventsJson from './__fixtures__/events.json';
 import { RelayerAPIService } from './RelayerAPIService';
@@ -18,7 +24,7 @@ const mockContract = {
   getMessageStatus: jest.fn(),
   symbol: jest.fn(),
   filters: {
-    ERC20Sent: () => jest.fn().mockReturnValue('ERC20Sent'),
+    ERC20Sent: () => 'ERC20Sent',
   },
 };
 
@@ -48,8 +54,7 @@ const mockErc20Event = {
   args: {
     token: '0x123',
     amount: '100',
-    msgHash:
-      '0x289d8464b91c2f31f6170942f29cdb815148dc527fbbbcd5ff158c0f5b9ac766',
+    msgHash: '0x123',
     message: {
       owner: walletAddress,
       data: '0x789',
@@ -60,7 +65,6 @@ const mockErc20Event = {
 const mockErc20Query = [mockErc20Event];
 
 const baseUrl = RELAYER_URL.replace(/\/$/, '');
-
 const relayerApi = new RelayerAPIService(RELAYER_URL, mockProviders);
 
 describe('RelayerAPIService', () => {
@@ -100,16 +104,37 @@ describe('RelayerAPIService', () => {
     expect(data.items.length).toEqual(eventsJson.items.length);
   });
 
-  it('cannot get transactions from API', async () => {
+  it('should return an empty list when API fails', async () => {
+    const args = {
+      address: walletAddress,
+      chainID: 1,
+      event: 'MessageSent',
+    };
+
     jest.mocked(axios.get).mockRejectedValueOnce(new Error('BAM!!'));
 
-    await expect(
-      relayerApi.getTransactionsFromAPI({
-        address: walletAddress,
-        chainID: 1,
-        event: 'MessageSent',
-      }),
-    ).rejects.toThrowError('could not fetch transactions from API');
+    await expect(relayerApi.getTransactionsFromAPI(args)).rejects.toThrowError(
+      'could not fetch transactions from API',
+    );
+
+    // Status >= 400 is considered an error
+    jest.mocked(axios.get).mockResolvedValueOnce({
+      status: 500,
+    });
+
+    await expect(relayerApi.getTransactionsFromAPI(args)).rejects.toThrowError(
+      'could not fetch transactions from API',
+    );
+
+    // Status < 400 is considered a success
+    jest.mocked(axios.get).mockResolvedValueOnce({
+      status: 200,
+      data: eventsJson,
+    });
+
+    await expect(relayerApi.getTransactionsFromAPI(args)).resolves.toEqual(
+      eventsJson,
+    );
   });
 
   it('should get empty list of transactions', async () => {
@@ -142,8 +167,22 @@ describe('RelayerAPIService', () => {
   });
 
   it('should get filtered bridge transactions by address', async () => {
+    // TODO: use structuredClone(), instead of JSON.parse(JSON.stringify())
+    const items = JSON.parse(
+      JSON.stringify(eventsJson.items),
+    ) as APIResponseTransaction[];
+
+    // Ignore transactions from unsupported chains
+    items[0].chainID = items[0].data.Message.SrcChainId = 666;
+
+    // Filter out duplicate transactions
+    items[2].data.Raw.transactionHash = items[1].data.Raw.transactionHash;
+
+    // Filter out transactions with wrong bridge address
+    items[4].data.Raw.address = '0x666';
+
     jest.mocked(axios.get).mockResolvedValueOnce({
-      data: eventsJson,
+      data: { ...eventsJson, items },
     });
 
     const { txs } = await relayerApi.getAllBridgeTransactionByAddress(
@@ -154,28 +193,24 @@ describe('RelayerAPIService', () => {
       },
     );
 
-    // Test parameters
-    expect(axios.get).toHaveBeenCalledWith(`${baseUrl}/events`, {
-      params: {
-        address: walletAddress,
-        event: 'MessageSent',
-        page: 0,
-        size: 100,
-      },
-    });
-
-    // There are transactions with duplicate transactionHash.
-    // We are expecting here less bridge txs than what we
-    // have in the fixture.
-    expect(txs.length).toBeLessThan(eventsJson.items.length);
+    expect(txs.length).toBe(items.length - 3);
   });
 
   it('should get only L2 => L1 transactions by address', async () => {
+    const items = JSON.parse(
+      JSON.stringify(eventsJson.items),
+    ) as APIResponseTransaction[];
+
+    // 5th items is L2 => L1
+    items[5].chainID = items[5].data.Message.SrcChainId = L2_CHAIN_ID;
+    items[5].data.Raw.address = L2_BRIDGE_ADDRESS;
+    items[5].data.Message.DestChainId = L1_CHAIN_ID;
+
     jest.mocked(axios.get).mockResolvedValueOnce({
-      data: eventsJson,
+      data: { ...eventsJson, items },
     });
 
-    // Transactions with no receipt are not included
+    // Non of the transactions L1 => L2 have receipts
     jest
       .mocked(mockProviders[L1_CHAIN_ID].getTransactionReceipt)
       .mockResolvedValue(null);
@@ -188,36 +223,37 @@ describe('RelayerAPIService', () => {
       },
     );
 
-    expect(txs.length).toBeGreaterThanOrEqual(1);
+    expect(txs.length).toBe(1);
 
     const chainIds = txs.map((tx) => tx.message.srcChainId);
     expect(chainIds).not.toContain(L1_CHAIN_ID);
   });
 
   it('should get all transactions by address', async () => {
+    const items = JSON.parse(
+      JSON.stringify(eventsJson.items),
+    ) as APIResponseTransaction[];
+
+    // We make one ETH bridge transaction
+    items[7].data.Message.Data = '';
+    items[7].canonicalTokenAddress = ethers.constants.AddressZero;
+
     jest.mocked(axios.get).mockResolvedValueOnce({
-      data: eventsJson,
+      data: { ...eventsJson, items },
     });
 
-    const { txs } = await relayerApi.getAllBridgeTransactionByAddress(
-      walletAddress,
-      {
-        page: 0,
-        size: 100,
-      },
-    );
+    await relayerApi.getAllBridgeTransactionByAddress(walletAddress, {
+      page: 0,
+      size: 100,
+    });
 
     expect(
       mockProviders[L1_CHAIN_ID].getTransactionReceipt,
-    ).toHaveBeenCalledTimes(3);
-
-    expect(
-      mockProviders[L2_CHAIN_ID].getTransactionReceipt,
-    ).toHaveBeenCalledTimes(1);
+    ).toHaveBeenCalledTimes(10);
 
-    expect(mockContract.getMessageStatus).toHaveBeenCalledTimes(4);
-    expect(mockContract.queryFilter).toHaveBeenCalledTimes(1);
-    expect(mockContract.symbol).toHaveBeenCalledTimes(1);
+    expect(mockContract.getMessageStatus).toHaveBeenCalledTimes(10);
+    expect(mockContract.queryFilter).toHaveBeenCalledTimes(9);
+    expect(mockContract.symbol).toHaveBeenCalledTimes(9);
   });
 
   it('should not get transactions with wrong address', async () => {
@@ -236,18 +272,24 @@ describe('RelayerAPIService', () => {
     expect(txs.length).toEqual(0);
   });
 
-  it('ignores transactions from chains not supported by the bridge', async () => {
-    // TODO: use structuredClone(). Nodejs support?
-    const noSupportedTx = JSON.parse(JSON.stringify(eventsJson.items[0]));
-    noSupportedTx.data.Message.SrcChainId = 666;
-
-    const newEventsJson = {
-      ...eventsJson,
-      items: [noSupportedTx, ...eventsJson.items.slice(1)],
-    };
+  it('should show New transactions on top', async () => {
+    let count = 0;
+    // Let's make some transactions to be New
+    mockContract.getMessageStatus.mockImplementation(() => {
+      count++;
+
+      switch (count) {
+        case 3:
+        case 5:
+        case 9:
+          return Promise.resolve(MessageStatus.New);
+        default:
+          return Promise.resolve(MessageStatus.Done);
+      }
+    });
 
     jest.mocked(axios.get).mockResolvedValueOnce({
-      data: newEventsJson,
+      data: eventsJson,
     });
 
     const { txs } = await relayerApi.getAllBridgeTransactionByAddress(
@@ -258,8 +300,21 @@ describe('RelayerAPIService', () => {
       },
     );
 
-    // expected = total_items - duplicated_tx - unsupported_tx
-    expect(txs.length).toEqual(eventsJson.items.length - 1 - 1);
+    const statuses = txs.map((tx) => tx.status);
+
+    expect(statuses).toEqual([
+      MessageStatus.New,
+      MessageStatus.New,
+      MessageStatus.New,
+      //----------------//
+      MessageStatus.Done,
+      MessageStatus.Done,
+      MessageStatus.Done,
+      MessageStatus.Done,
+      MessageStatus.Done,
+      MessageStatus.Done,
+      MessageStatus.Done,
+    ]);
   });
 
   // TODO: there are still some branches to cover here
@@ -283,11 +338,20 @@ describe('RelayerAPIService', () => {
     );
   });
 
-  it('cannot get block info', async () => {
+  it('handles API failure', async () => {
     jest.mocked(axios.get).mockRejectedValueOnce(new Error('BAM!!'));
 
     await expect(relayerApi.getBlockInfo()).rejects.toThrowError(
       'failed to fetch block info',
     );
+
+    // Status >= 400 is considered an error
+    jest.mocked(axios.get).mockResolvedValueOnce({
+      status: 400,
+    });
+
+    await expect(relayerApi.getBlockInfo()).rejects.toThrowError(
+      'failed to fetch block info',
+    );
   });
 });
diff --git a/packages/bridge-ui/src/relayer-api/RelayerAPIService.ts b/packages/bridge-ui/src/relayer-api/RelayerAPIService.ts
index 5795f4e9c6..99f8db4694 100644
--- a/packages/bridge-ui/src/relayer-api/RelayerAPIService.ts
+++ b/packages/bridge-ui/src/relayer-api/RelayerAPIService.ts
@@ -23,15 +23,26 @@ import { tokenVaults } from '../vault/tokenVaults';
 const log = getLogger('RelayerAPIService');
 
 export class RelayerAPIService implements RelayerAPI {
-  private static _filterDuplicateHashes(items: APIResponseTransaction[]) {
+  private static _filterDuplicateAndWrongBridge(
+    items: APIResponseTransaction[],
+  ) {
     const uniqueHashes = new Set<string>();
     const filteredItems: APIResponseTransaction[] = [];
 
     for (const item of items) {
-      if (!uniqueHashes.has(item.data.Raw.transactionHash)) {
-        uniqueHashes.add(item.data.Raw.transactionHash);
-        filteredItems.push(item);
-      }
+      const { transactionHash, address } = item.data?.Raw;
+      const bridgeAddress = chains[item.chainID]?.bridgeAddress; // will also handle unsupported chain
+      const hasDuplicateHash = uniqueHashes.has(transactionHash);
+      const wrongBridgeAddress =
+        address?.toLowerCase() !== bridgeAddress?.toLowerCase();
+
+      // Do not include tx if for whatever reason the properties transactionHash
+      // and address are not present in the response
+      const shouldIncludeTx =
+        transactionHash && address && !hasDuplicateHash && !wrongBridgeAddress;
+
+      if (!hasDuplicateHash) uniqueHashes.add(transactionHash);
+      if (shouldIncludeTx) filteredItems.push(item);
     }
 
     return filteredItems;
@@ -112,7 +123,7 @@ export class RelayerAPIService implements RelayerAPI {
 
       const response = await axios.get<APIResponse>(requestURL, { params });
 
-      // TODO: status >= 400 ?
+      if (response.status >= 400) throw response;
 
       log('Events form API', response.data);
 
@@ -158,7 +169,10 @@ export class RelayerAPIService implements RelayerAPI {
       return { txs: [], paginationInfo };
     }
 
-    const items = RelayerAPIService._filterDuplicateHashes(apiTxs.items);
+    // TODO: maybe we should also filter out unsupported chains here?
+    const items = RelayerAPIService._filterDuplicateAndWrongBridge(
+      apiTxs.items,
+    );
 
     const txs = items.map((tx: APIResponseTransaction) => {
       let data = tx.data.Message.Data;
@@ -193,11 +207,9 @@ export class RelayerAPIService implements RelayerAPI {
           callValue: BigNumber.from(tx.data.Message.CallValue.toString()),
           srcChainId: tx.data.Message.SrcChainId,
           destChainId: tx.data.Message.DestChainId,
-          depositValue: BigNumber.from(
-            `${tx.data.Message.DepositValue.toString()}`,
-          ),
+          depositValue: BigNumber.from(tx.data.Message.DepositValue.toString()),
           processingFee: BigNumber.from(
-            `${tx.data.Message.ProcessingFee.toString()}`,
+            tx.data.Message.ProcessingFee.toString(),
           ),
           refundAddress: tx.data.Message.RefundAddress,
         },
@@ -224,7 +236,7 @@ export class RelayerAPIService implements RelayerAPI {
       const srcProvider = this.providers[srcChainId];
 
       // Ignore transactions from chains not supported by the bridge
-      if (!srcProvider) return;
+      if (!srcProvider || !destProvider) return;
 
       // Returns the transaction receipt for hash or null
       // if the transaction has not been mined.
@@ -249,6 +261,7 @@ export class RelayerAPIService implements RelayerAPI {
         msgHash,
       );
 
+      // Update the status
       bridgeTx.status = status;
 
       let amountInWei: BigNumber = tx.amountInWei;
@@ -310,11 +323,13 @@ export class RelayerAPIService implements RelayerAPI {
     const blockInfoMap: Map<number, RelayerBlockInfo> = new Map();
 
     try {
-      const { data } = await axios.get<{ data: RelayerBlockInfo[] }>(
+      const response = await axios.get<{ data: RelayerBlockInfo[] }>(
         requestURL,
       );
 
-      // TODO: status >= 400 ?
+      if (response.status >= 400) throw response;
+
+      const { data } = response;
 
       if (data?.data.length > 0) {
         data.data.forEach((blockInfo) => {
diff --git a/packages/bridge-ui/src/relayer-api/__fixtures__/events.json b/packages/bridge-ui/src/relayer-api/__fixtures__/events.json
index 4854071568..6d0eb281c5 100644
--- a/packages/bridge-ui/src/relayer-api/__fixtures__/events.json
+++ b/packages/bridge-ui/src/relayer-api/__fixtures__/events.json
@@ -1,212 +1,392 @@
 {
   "items": [
     {
-      "id": 42752,
+      "id": 1,
       "name": "MessageSent",
       "data": {
         "Raw": {
           "data": "0x123",
           "address": "0xc6e7df5e7b4f2a278906862b61205850344d4e7d",
-          "removed": false,
-          "logIndex": "0x8",
-          "blockHash": "0xbf898a28993aa0acb5160d8f3f80200cc2a38ffbd89abc1d0399d7c6879cdfd9",
-          "blockNumber": "0x9d13",
-          "transactionHash": "0x48e10c32f89ef5c19c3148a8e26ac96bb39804b2894e41cb53f420da2075999c",
+          "blockHash": "0x123",
+          "blockNumber": "0x123",
+          "transactionHash": "0x1",
+          "transactionIndex": "0x1"
+        },
+        "Message": {
+          "Id": 1,
+          "To": "0x1000777700000000000000000000000000000002",
+          "Data": "Data",
+          "Memo": "",
+          "Owner": "0x123",
+          "Sender": "0x123",
+          "GasLimit": 1,
+          "CallValue": 0,
+          "SrcChainId": 31336,
+          "DestChainId": 167001,
+          "DepositValue": 1,
+          "ProcessingFee": 1,
+          "RefundAddress": "0x123"
+        }
+      },
+      "status": 2,
+      "chainID": 31336,
+      "canonicalTokenAddress": "0x123",
+      "canonicalTokenSymbol": "TT",
+      "canonicalTokenName": "Test Token",
+      "canonicalTokenDecimals": 18,
+      "amount": "1",
+      "msgHash": "0x123",
+      "messageOwner": "0x33C887d229B5b99cdfa06B02102f8F75411C56B8",
+      "event": "MessageSent"
+    },
+    {
+      "id": 2,
+      "name": "MessageSent",
+      "data": {
+        "Raw": {
+          "data": "0x123",
+          "address": "0xc6e7df5e7b4f2a278906862b61205850344d4e7d",
+          "blockHash": "0x123",
+          "blockNumber": "0x123",
+          "transactionHash": "0x2",
+          "transactionIndex": "0x2"
+        },
+        "Message": {
+          "Id": 1,
+          "To": "0x1000777700000000000000000000000000000002",
+          "Data": "Data",
+          "Memo": "",
+          "Owner": "0x123",
+          "Sender": "0x123",
+          "GasLimit": 1,
+          "CallValue": 0,
+          "SrcChainId": 31336,
+          "DestChainId": 167001,
+          "DepositValue": 1,
+          "ProcessingFee": 1,
+          "RefundAddress": "0x123"
+        }
+      },
+      "status": 2,
+      "chainID": 31336,
+      "canonicalTokenAddress": "0x123",
+      "canonicalTokenSymbol": "TT",
+      "canonicalTokenName": "Test Token",
+      "canonicalTokenDecimals": 18,
+      "amount": "1",
+      "msgHash": "0x123",
+      "messageOwner": "0x33C887d229B5b99cdfa06B02102f8F75411C56B8",
+      "event": "MessageSent"
+    },
+    {
+      "id": 3,
+      "name": "MessageSent",
+      "data": {
+        "Raw": {
+          "data": "0x123",
+          "address": "0xc6e7df5e7b4f2a278906862b61205850344d4e7d",
+          "blockHash": "0x123",
+          "blockNumber": "0x123",
+          "transactionHash": "0x3",
           "transactionIndex": "0x3"
         },
         "Message": {
-          "Id": 7801,
+          "Id": 1,
           "To": "0x1000777700000000000000000000000000000002",
           "Data": "Data",
           "Memo": "",
-          "Owner": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "Sender": "0x322813fd9a801c5507c9de605d63cea4f2ce6c44",
-          "GasLimit": 140000,
+          "Owner": "0x123",
+          "Sender": "0x123",
+          "GasLimit": 1,
           "CallValue": 0,
           "SrcChainId": 31336,
           "DestChainId": 167001,
-          "DepositValue": 0,
-          "ProcessingFee": 4650000003100000,
-          "RefundAddress": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8"
+          "DepositValue": 1,
+          "ProcessingFee": 1,
+          "RefundAddress": "0x123"
         }
       },
       "status": 2,
-      "eventType": 1,
       "chainID": 31336,
-      "canonicalTokenAddress": "0x9A676e781A523b5d0C0e43731313A708CB607508",
-      "canonicalTokenSymbol": "BLL",
-      "canonicalTokenName": "Bull Token",
+      "canonicalTokenAddress": "0x123",
+      "canonicalTokenSymbol": "TT",
+      "canonicalTokenName": "Test Token",
       "canonicalTokenDecimals": 18,
-      "amount": "5000000000000000000",
-      "msgHash": "0x289d8464b91c2f31f6170942f29cdb815148dc527fbbbcd5ff158c0f5b9ac766",
+      "amount": "1",
+      "msgHash": "0x123",
       "messageOwner": "0x33C887d229B5b99cdfa06B02102f8F75411C56B8",
       "event": "MessageSent"
     },
     {
-      "id": 42763,
+      "id": 4,
       "name": "MessageSent",
       "data": {
         "Raw": {
           "data": "0x123",
           "address": "0xc6e7df5e7b4f2a278906862b61205850344d4e7d",
-          "removed": false,
-          "logIndex": "0x4",
-          "blockHash": "0xa35f409355d150054d82a75f122d33ea9e3f5236072cdee350b53c12b109e77b",
-          "blockNumber": "0x9d1a",
-          "transactionHash": "0xd22de4483f27ad8652a542077e8e4c1e9ed337e744574bbd1a5a2c41ac5360b2",
-          "transactionIndex": "0x1"
+          "blockHash": "0x123",
+          "blockNumber": "0x123",
+          "transactionHash": "0x4",
+          "transactionIndex": "0x4"
+        },
+        "Message": {
+          "Id": 1,
+          "To": "0x1000777700000000000000000000000000000002",
+          "Data": "Data",
+          "Memo": "",
+          "Owner": "0x123",
+          "Sender": "0x123",
+          "GasLimit": 1,
+          "CallValue": 0,
+          "SrcChainId": 31336,
+          "DestChainId": 167001,
+          "DepositValue": 1,
+          "ProcessingFee": 1,
+          "RefundAddress": "0x123"
+        }
+      },
+      "status": 2,
+      "chainID": 31336,
+      "canonicalTokenAddress": "0x123",
+      "canonicalTokenSymbol": "TT",
+      "canonicalTokenName": "Test Token",
+      "canonicalTokenDecimals": 18,
+      "amount": "1",
+      "msgHash": "0x123",
+      "messageOwner": "0x33C887d229B5b99cdfa06B02102f8F75411C56B8",
+      "event": "MessageSent"
+    },
+    {
+      "id": 5,
+      "name": "MessageSent",
+      "data": {
+        "Raw": {
+          "data": "0x123",
+          "address": "0xc6e7df5e7b4f2a278906862b61205850344d4e7d",
+          "blockHash": "0x123",
+          "blockNumber": "0x123",
+          "transactionHash": "0x5",
+          "transactionIndex": "0x5"
         },
         "Message": {
-          "Id": 7803,
-          "To": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "Data": "",
+          "Id": 1,
+          "To": "0x1000777700000000000000000000000000000002",
+          "Data": "Data",
           "Memo": "",
-          "Owner": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "Sender": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "GasLimit": 140000,
+          "Owner": "0x123",
+          "Sender": "0x123",
+          "GasLimit": 1,
           "CallValue": 0,
           "SrcChainId": 31336,
           "DestChainId": 167001,
-          "DepositValue": 10000000000000000000,
-          "ProcessingFee": 1350000000900000,
-          "RefundAddress": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8"
+          "DepositValue": 1,
+          "ProcessingFee": 1,
+          "RefundAddress": "0x123"
         }
       },
       "status": 2,
-      "eventType": 0,
       "chainID": 31336,
-      "canonicalTokenAddress": "0x0000000000000000000000000000000000000000",
-      "canonicalTokenSymbol": "",
-      "canonicalTokenName": "",
-      "canonicalTokenDecimals": 0,
-      "amount": "10000000000000000000",
-      "msgHash": "0x955e9841c5b9b6bc449800f97312c6f4e798a824a7fb510808a488d9873d7e86",
+      "canonicalTokenAddress": "0x123",
+      "canonicalTokenSymbol": "TT",
+      "canonicalTokenName": "Test Token",
+      "canonicalTokenDecimals": 18,
+      "amount": "1",
+      "msgHash": "0x123",
       "messageOwner": "0x33C887d229B5b99cdfa06B02102f8F75411C56B8",
       "event": "MessageSent"
     },
     {
-      "id": 46456,
+      "id": 6,
       "name": "MessageSent",
       "data": {
         "Raw": {
           "data": "0x123",
-          "address": "0x1000777700000000000000000000000000000004",
-          "removed": false,
-          "logIndex": "0xc",
-          "blockHash": "0xc7a9751ab93f3d2a429189ef195fb1eef8fb121525f5c121b977f2745010a741",
-          "blockNumber": "0x6004",
-          "transactionHash": "0xaf89166c616b5d80db1afe29380221e37c33b20e76fdd3bbcaa566bebb35ee80",
+          "address": "0xc6e7df5e7b4f2a278906862b61205850344d4e7d",
+          "blockHash": "0x123",
+          "blockNumber": "0x123",
+          "transactionHash": "0x6",
           "transactionIndex": "0x6"
         },
         "Message": {
-          "Id": 5785,
-          "To": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "Data": "",
+          "Id": 1,
+          "To": "0x1000777700000000000000000000000000000002",
+          "Data": "Data",
           "Memo": "",
-          "Owner": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "Sender": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "GasLimit": 140000,
+          "Owner": "0x123",
+          "Sender": "0x123",
+          "GasLimit": 1,
           "CallValue": 0,
-          "SrcChainId": 167001,
-          "DestChainId": 31336,
-          "DepositValue": 3.3e19,
-          "ProcessingFee": 1350000006300000,
-          "RefundAddress": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8"
+          "SrcChainId": 31336,
+          "DestChainId": 167001,
+          "DepositValue": 1,
+          "ProcessingFee": 1,
+          "RefundAddress": "0x123"
         }
       },
       "status": 2,
-      "eventType": 0,
-      "chainID": 167001,
-      "canonicalTokenAddress": "0x0000000000000000000000000000000000000000",
-      "canonicalTokenSymbol": "",
-      "canonicalTokenName": "",
-      "canonicalTokenDecimals": 0,
-      "amount": "33000000000000000000",
-      "msgHash": "0x10858ddd2d21d2ee72802d864b998fac8ea38779427bc1164656e3f5374ad8a5",
+      "chainID": 31336,
+      "canonicalTokenAddress": "0x123",
+      "canonicalTokenSymbol": "TT",
+      "canonicalTokenName": "Test Token",
+      "canonicalTokenDecimals": 18,
+      "amount": "1",
+      "msgHash": "0x123",
       "messageOwner": "0x33C887d229B5b99cdfa06B02102f8F75411C56B8",
       "event": "MessageSent"
     },
     {
-      "id": 46602,
+      "id": 7,
       "name": "MessageSent",
       "data": {
         "Raw": {
           "data": "0x123",
           "address": "0xc6e7df5e7b4f2a278906862b61205850344d4e7d",
-          "removed": false,
-          "logIndex": "0x4",
-          "blockHash": "0x91e912064c75f8fa64273b923cbcf2453b6c537046eab149e9ed646a12161487",
-          "blockNumber": "0xac72",
-          "transactionHash": "0x23902041dc0493409ebc8fdb74aa8c9a91e3c1544584a79deed99311af5ad5b1",
-          "transactionIndex": "0x2"
+          "blockHash": "0x123",
+          "blockNumber": "0x123",
+          "transactionHash": "0x7",
+          "transactionIndex": "0x7"
         },
         "Message": {
-          "Id": 8465,
-          "To": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "Data": "",
+          "Id": 1,
+          "To": "0x1000777700000000000000000000000000000002",
+          "Data": "Data",
           "Memo": "",
-          "Owner": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "Sender": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "GasLimit": 140000,
+          "Owner": "0x123",
+          "Sender": "0x123",
+          "GasLimit": 1,
           "CallValue": 0,
           "SrcChainId": 31336,
           "DestChainId": 167001,
-          "DepositValue": 3.46e20,
-          "ProcessingFee": 1350000000900000,
-          "RefundAddress": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8"
+          "DepositValue": 1,
+          "ProcessingFee": 1,
+          "RefundAddress": "0x123"
         }
       },
-      "status": 0,
-      "eventType": 0,
+      "status": 2,
       "chainID": 31336,
-      "canonicalTokenAddress": "0x0000000000000000000000000000000000000000",
-      "canonicalTokenSymbol": "",
-      "canonicalTokenName": "",
-      "canonicalTokenDecimals": 0,
-      "amount": "346000000000000000000",
-      "msgHash": "0x314041cfeb2282b41930fd950bd69c6af75eb50ddaa615951951310be022db25",
+      "canonicalTokenAddress": "0x123",
+      "canonicalTokenSymbol": "TT",
+      "canonicalTokenName": "Test Token",
+      "canonicalTokenDecimals": 18,
+      "amount": "1",
+      "msgHash": "0x123",
       "messageOwner": "0x33C887d229B5b99cdfa06B02102f8F75411C56B8",
       "event": "MessageSent"
     },
     {
-      "id": 46610,
+      "id": 8,
       "name": "MessageSent",
       "data": {
         "Raw": {
           "data": "0x123",
           "address": "0xc6e7df5e7b4f2a278906862b61205850344d4e7d",
-          "removed": false,
-          "logIndex": "0x4",
-          "blockHash": "0x91e912064c75f8fa64273b923cbcf2453b6c537046eab149e9ed646a12161487",
-          "blockNumber": "0xac72",
-          "transactionHash": "0x23902041dc0493409ebc8fdb74aa8c9a91e3c1544584a79deed99311af5ad5b1",
-          "transactionIndex": "0x2"
+          "blockHash": "0x123",
+          "blockNumber": "0x123",
+          "transactionHash": "0x8",
+          "transactionIndex": "0x8"
+        },
+        "Message": {
+          "Id": 1,
+          "To": "0x1000777700000000000000000000000000000002",
+          "Data": "Data",
+          "Memo": "",
+          "Owner": "0x123",
+          "Sender": "0x123",
+          "GasLimit": 1,
+          "CallValue": 0,
+          "SrcChainId": 31336,
+          "DestChainId": 167001,
+          "DepositValue": 1,
+          "ProcessingFee": 1,
+          "RefundAddress": "0x123"
+        }
+      },
+      "status": 2,
+      "chainID": 31336,
+      "canonicalTokenAddress": "0x123",
+      "canonicalTokenSymbol": "TT",
+      "canonicalTokenName": "Test Token",
+      "canonicalTokenDecimals": 18,
+      "amount": "1",
+      "msgHash": "0x123",
+      "messageOwner": "0x33C887d229B5b99cdfa06B02102f8F75411C56B8",
+      "event": "MessageSent"
+    },
+    {
+      "id": 9,
+      "name": "MessageSent",
+      "data": {
+        "Raw": {
+          "data": "0x123",
+          "address": "0xc6e7df5e7b4f2a278906862b61205850344d4e7d",
+          "blockHash": "0x123",
+          "blockNumber": "0x123",
+          "transactionHash": "0x9",
+          "transactionIndex": "0x9"
         },
         "Message": {
-          "Id": 8465,
-          "To": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "Data": "",
+          "Id": 1,
+          "To": "0x1000777700000000000000000000000000000002",
+          "Data": "Data",
           "Memo": "",
-          "Owner": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "Sender": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8",
-          "GasLimit": 140000,
+          "Owner": "0x123",
+          "Sender": "0x123",
+          "GasLimit": 1,
           "CallValue": 0,
           "SrcChainId": 31336,
           "DestChainId": 167001,
-          "DepositValue": 3.46e20,
-          "ProcessingFee": 1350000000900000,
-          "RefundAddress": "0x33c887d229b5b99cdfa06b02102f8f75411c56b8"
+          "DepositValue": 1,
+          "ProcessingFee": 1,
+          "RefundAddress": "0x123"
         }
       },
       "status": 2,
-      "eventType": 0,
       "chainID": 31336,
-      "canonicalTokenAddress": "0x0000000000000000000000000000000000000000",
-      "canonicalTokenSymbol": "",
-      "canonicalTokenName": "",
-      "canonicalTokenDecimals": 0,
-      "amount": "346000000000000000000",
-      "msgHash": "0x314041cfeb2282b41930fd950bd69c6af75eb50ddaa615951951310be022db25",
+      "canonicalTokenAddress": "0x123",
+      "canonicalTokenSymbol": "TT",
+      "canonicalTokenName": "Test Token",
+      "canonicalTokenDecimals": 18,
+      "amount": "1",
+      "msgHash": "0x123",
+      "messageOwner": "0x33C887d229B5b99cdfa06B02102f8F75411C56B8",
+      "event": "MessageSent"
+    },
+    {
+      "id": 10,
+      "name": "MessageSent",
+      "data": {
+        "Raw": {
+          "data": "0x123",
+          "address": "0xc6e7df5e7b4f2a278906862b61205850344d4e7d",
+          "blockHash": "0x123",
+          "blockNumber": "0x123",
+          "transactionHash": "0x10",
+          "transactionIndex": "0x10"
+        },
+        "Message": {
+          "Id": 1,
+          "To": "0x1000777700000000000000000000000000000002",
+          "Data": "Data",
+          "Memo": "",
+          "Owner": "0x123",
+          "Sender": "0x123",
+          "GasLimit": 1,
+          "CallValue": 0,
+          "SrcChainId": 31336,
+          "DestChainId": 167001,
+          "DepositValue": 1,
+          "ProcessingFee": 1,
+          "RefundAddress": "0x123"
+        }
+      },
+      "status": 2,
+      "chainID": 31336,
+      "canonicalTokenAddress": "0x123",
+      "canonicalTokenSymbol": "TT",
+      "canonicalTokenName": "Test Token",
+      "canonicalTokenDecimals": 18,
+      "amount": "1",
+      "msgHash": "0x123",
       "messageOwner": "0x33C887d229B5b99cdfa06B02102f8F75411C56B8",
       "event": "MessageSent"
     }