From 12e059a2b9efcba48967142529be8a09929d5f93 Mon Sep 17 00:00:00 2001 From: tom Date: Mon, 11 Nov 2024 14:09:28 +0100 Subject: [PATCH] Bind to full prop namings in API v2 endpoints Fixes #2374 --- lib/block/getBlockReward.ts | 2 +- mocks/address/address.ts | 8 +- mocks/blocks/block.ts | 10 +-- mocks/contracts/index.ts | 4 +- mocks/mud/mudWorlds.ts | 6 +- mocks/optimism/deposits.ts | 26 +++--- mocks/optimism/outputRoots.ts | 6 +- mocks/optimism/txnBatches.ts | 24 +++--- mocks/optimism/withdrawals.ts | 12 +-- mocks/search/index.ts | 2 +- mocks/stats/daily_txs.ts | 84 +++++++++---------- mocks/tokens/tokenTransfer.ts | 8 +- mocks/zkEvm/txnBatches.ts | 16 ++-- mocks/zkSync/zkSyncTxnBatch.ts | 4 +- mocks/zkSync/zkSyncTxnBatches.ts | 6 +- stubs/L2.ts | 18 ++-- stubs/address.ts | 4 +- stubs/block.ts | 4 +- stubs/contract.ts | 2 +- stubs/log.ts | 2 +- stubs/mud.ts | 2 +- stubs/search.ts | 2 +- stubs/token.ts | 2 +- stubs/zkEvmL2.ts | 10 +-- stubs/zkSyncL2.ts | 6 +- types/api/account.ts | 2 +- types/api/address.ts | 2 +- types/api/addresses.ts | 2 +- types/api/block.ts | 8 +- types/api/charts.ts | 2 +- types/api/contracts.ts | 2 +- types/api/log.ts | 2 +- types/api/mudWorlds.ts | 2 +- types/api/optimisticL2.ts | 24 +++--- types/api/search.ts | 4 +- types/api/tokenTransfer.ts | 2 +- types/api/transaction.ts | 2 +- types/api/zkEvmL2.ts | 10 +-- types/api/zkSyncL2.ts | 8 +- ui/address/AddressDetails.tsx | 6 +- .../AddressBlocksValidatedListItem.tsx | 2 +- .../AddressBlocksValidatedTableItem.tsx | 2 +- ui/address/utils/useAddressQuery.ts | 2 +- ui/addresses/AddressesListItem.tsx | 2 +- ui/addresses/AddressesTableItem.tsx | 2 +- .../AddressesLabelSearchListItem.tsx | 2 +- .../AddressesLabelSearchTableItem.tsx | 2 +- ui/block/BlockDetails.tsx | 2 +- ui/block/useBlockQuery.tsx | 4 +- ui/blocks/BlocksListItem.tsx | 8 +- ui/blocks/BlocksTableItem.tsx | 8 +- .../OptimisticDepositsListItem.tsx | 8 +- .../optimisticL2/OptimisticDepositsTable.tsx | 2 +- .../OptimisticDepositsTableItem.tsx | 8 +- ui/home/LatestBlocksItem.tsx | 2 +- ui/home/indicators/utils/indicators.tsx | 2 +- .../latestBatches/LatestZkEvmL2Batches.tsx | 2 +- .../LatestOptimisticDeposits.tsx | 2 +- ui/mudWorlds/MudWorldsListItem.tsx | 2 +- ui/mudWorlds/MudWorldsTableItem.tsx | 2 +- .../OptimisticL2OutputRootsListItem.tsx | 2 +- .../OptimisticL2OutputRootsTableItem.tsx | 2 +- ui/pages/Accounts.pw.tsx | 8 +- ui/pages/AccountsLabelSearch.pw.tsx | 8 +- ui/pages/OptimisticL2Deposits.tsx | 4 +- ui/pages/SearchResults.pw.tsx | 6 +- ui/pages/TokenTransfers.tsx | 2 +- .../TransactionModal/TransactionForm.tsx | 4 +- ui/searchResults/SearchResultListItem.tsx | 4 +- ui/searchResults/SearchResultTableItem.tsx | 4 +- ui/shared/TokenTransfer/TokenTransferList.tsx | 2 +- .../TokenTransfer/TokenTransferListItem.tsx | 2 +- .../TokenTransfer/TokenTransferTable.tsx | 2 +- .../TokenTransfer/TokenTransferTableItem.tsx | 2 +- ui/shared/logs/LogItem.pw.tsx | 4 +- ui/shared/logs/LogItem.tsx | 2 +- ui/snippets/searchBar/SearchBar.pw.tsx | 8 +- .../SearchBarSuggest/SearchBarSuggestItem.tsx | 2 +- .../SearchBarSuggest/SearchBarSuggestTx.tsx | 2 +- ui/token/TokenTransfer/TokenTransferList.tsx | 2 +- .../TokenTransfer/TokenTransferListItem.tsx | 2 +- ui/token/TokenTransfer/TokenTransferTable.tsx | 2 +- .../TokenTransfer/TokenTransferTableItem.tsx | 2 +- ui/tokenTransfers/TokenTransfersListItem.tsx | 2 +- ui/tokenTransfers/TokenTransfersTable.tsx | 2 +- ui/tokenTransfers/TokenTransfersTableItem.tsx | 2 +- .../OptimisticL2TxnBatchDetails.tsx | 4 +- .../OptimisticL2TxnBatchesListItem.tsx | 4 +- .../OptimisticL2TxnBatchesTableItem.tsx | 4 +- .../zkEvmL2/ZkEvmL2TxnBatchDetails.tsx | 8 +- .../zkEvmL2/ZkEvmTxnBatchesListItem.tsx | 10 +-- .../zkEvmL2/ZkEvmTxnBatchesTableItem.tsx | 10 +-- .../zkSyncL2/ZkSyncL2TxnBatchDetails.tsx | 2 +- .../zkSyncL2/ZkSyncTxnBatchesListItem.tsx | 2 +- .../zkSyncL2/ZkSyncTxnBatchesTableItem.tsx | 2 +- .../VerifiedContractsListItem.tsx | 2 +- .../VerifiedContractsTableItem.tsx | 2 +- .../OptimisticL2WithdrawalsListItem.tsx | 6 +- .../OptimisticL2WithdrawalsTableItem.tsx | 6 +- 99 files changed, 280 insertions(+), 280 deletions(-) diff --git a/lib/block/getBlockReward.ts b/lib/block/getBlockReward.ts index 3c00ac8d19..dfe2558232 100644 --- a/lib/block/getBlockReward.ts +++ b/lib/block/getBlockReward.ts @@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js'; import type { Block } from 'types/api/block'; export default function getBlockReward(block: Block) { - const txFees = BigNumber(block.tx_fees || 0); + const txFees = BigNumber(block.transaction_fees || 0); const burntFees = BigNumber(block.burnt_fees || 0); const minerReward = block.rewards?.find(({ type }) => type === 'Miner Reward' || type === 'Validator Reward')?.reward; const totalReward = BigNumber(minerReward || 0); diff --git a/mocks/address/address.ts b/mocks/address/address.ts index 112f774ba0..b3ad305aea 100644 --- a/mocks/address/address.ts +++ b/mocks/address/address.ts @@ -73,7 +73,7 @@ export const token: Address = { token: tokenInfo, block_number_balance_updated_at: 8201413, coin_balance: '1', - creation_tx_hash: '0xc38cf7377bf72d6436f63c37b01b24d032101f20ec1849286dc703c712f10c98', + creation_transaction_hash: '0xc38cf7377bf72d6436f63c37b01b24d032101f20ec1849286dc703c712f10c98', creator_address_hash: '0x34A9c688512ebdB575e82C50c9803F6ba2916E72', exchange_rate: '0.04311', has_decompiled_code: false, @@ -87,7 +87,7 @@ export const token: Address = { export const eoa: Address = { block_number_balance_updated_at: 30811263, coin_balance: '2782650189688719421432220500', - creation_tx_hash: '0xf2aff6501b632604c39978b47d309813d8a1bcca721864bbe86abf59704f195e', + creation_transaction_hash: '0xf2aff6501b632604c39978b47d309813d8a1bcca721864bbe86abf59704f195e', creator_address_hash: '0x803ad3F50b9e1fF68615e8B053A186e1be288943', exchange_rate: '0.04311', has_decompiled_code: false, @@ -111,7 +111,7 @@ export const eoa: Address = { export const contract: Address = { block_number_balance_updated_at: 30811263, coin_balance: '27826501896887194214322205', - creation_tx_hash: '0xf2aff6501b632604c39978b47d309813d8a1bcca721864bbe86abf59704f195e', + creation_transaction_hash: '0xf2aff6501b632604c39978b47d309813d8a1bcca721864bbe86abf59704f195e', creator_address_hash: '0x803ad3F50b9e1fF68615e8B053A186e1be288943', exchange_rate: '0.04311', has_decompiled_code: false, @@ -137,7 +137,7 @@ export const contract: Address = { export const validator: Address = { block_number_balance_updated_at: 30811932, coin_balance: '22910462800601256910890', - creation_tx_hash: null, + creation_transaction_hash: null, creator_address_hash: null, exchange_rate: '0.00432018', has_decompiled_code: false, diff --git a/mocks/blocks/block.ts b/mocks/blocks/block.ts index 281665fc01..c0348cb549 100644 --- a/mocks/blocks/block.ts +++ b/mocks/blocks/block.ts @@ -52,8 +52,8 @@ export const base: Block = { state_root: 'TODO', timestamp: '2022-11-11T11:59:35Z', total_difficulty: '10258276095980170141167591583995189665817672619', - tx_count: 5, - tx_fees: '26853607500000000', + transaction_count: 5, + transaction_fees: '26853607500000000', type: 'block', uncles_hashes: [], }; @@ -89,8 +89,8 @@ export const genesis: Block = { state_root: 'TODO', timestamp: '2017-12-16T00:13:24.000000Z', total_difficulty: '131072', - tx_count: 0, - tx_fees: '0', + transaction_count: 0, + transaction_fees: '0', type: 'block', uncles_hashes: [], }; @@ -111,7 +111,7 @@ export const base2: Block = { ens_domain_name: null, }, timestamp: '2022-11-11T11:46:05Z', - tx_count: 253, + transaction_count: 253, gas_target_percentage: 23.6433, gas_used: '6333342', gas_used_percentage: 87.859504, diff --git a/mocks/contracts/index.ts b/mocks/contracts/index.ts index 86a0a0855c..e640c7a1df 100644 --- a/mocks/contracts/index.ts +++ b/mocks/contracts/index.ts @@ -18,7 +18,7 @@ export const contract1: VerifiedContract = { language: 'solidity', market_cap: null, optimization_enabled: false, - tx_count: 7334224, + transaction_count: 7334224, verified_at: '2022-09-16T18:49:29.605179Z', license_type: 'mit', }; @@ -42,7 +42,7 @@ export const contract2: VerifiedContract = { language: 'vyper', market_cap: null, optimization_enabled: true, - tx_count: 440, + transaction_count: 440, verified_at: '2021-09-07T20:01:56.076979Z', license_type: 'bsd_3_clause', }; diff --git a/mocks/mud/mudWorlds.ts b/mocks/mud/mudWorlds.ts index 2d8218e884..beb384a33c 100644 --- a/mocks/mud/mudWorlds.ts +++ b/mocks/mud/mudWorlds.ts @@ -7,17 +7,17 @@ export const mudWorlds: MudWorldsResponse = { { address: withName, coin_balance: '300000000000000000', - tx_count: 3938, + transaction_count: 3938, }, { address: withoutName, coin_balance: '0', - tx_count: 0, + transaction_count: 0, }, { address: withoutName, coin_balance: '0', - tx_count: 0, + transaction_count: 0, }, ], next_page_params: { diff --git a/mocks/optimism/deposits.ts b/mocks/optimism/deposits.ts index b94c2dc657..e2f0ba1e9e 100644 --- a/mocks/optimism/deposits.ts +++ b/mocks/optimism/deposits.ts @@ -3,31 +3,31 @@ export const data = { { l1_block_number: 8382841, l1_block_timestamp: '2022-05-27T01:13:48.000000Z', - l1_tx_hash: '0xaf3e5f4ef03eac22a622b3434c5dc9f4465aa291900a86bcf0ad9fb14429f05e', - l1_tx_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5', - l2_tx_gas_limit: '2156928', - l2_tx_hash: '0xb9212c76069b926917816767e4c5a0ef80e519b1ac1c3d3fb5818078f4984667', + l1_transaction_hash: '0xaf3e5f4ef03eac22a622b3434c5dc9f4465aa291900a86bcf0ad9fb14429f05e', + l1_transaction_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5', + l2_transaction_gas_limit: '2156928', + l2_transaction_hash: '0xb9212c76069b926917816767e4c5a0ef80e519b1ac1c3d3fb5818078f4984667', }, { l1_block_number: 8382841, l1_block_timestamp: '2022-05-27T01:13:48.000000Z', - l1_tx_hash: '0xa280f18cc72f9ad904087eb262c236048e935ad184a85bbd042d544c172c10bf', - l1_tx_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5', - l2_tx_gas_limit: '1216064', - l2_tx_hash: '0xaaaeb47a78b5c42d870f8d831a683a7cefe1b031a992170b28b43b82bd08318c', + l1_transaction_hash: '0xa280f18cc72f9ad904087eb262c236048e935ad184a85bbd042d544c172c10bf', + l1_transaction_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5', + l2_transaction_gas_limit: '1216064', + l2_transaction_hash: '0xaaaeb47a78b5c42d870f8d831a683a7cefe1b031a992170b28b43b82bd08318c', }, { l1_block_number: 8382834, l1_block_timestamp: '2022-06-27T01:11:48.000000Z', - l1_tx_hash: '0xfca8cc5440bffa8b975873c02bba3ff3380dd75fbc3260d10179e282cf72d6d4', - l1_tx_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5', - l2_tx_gas_limit: '405824', - l2_tx_hash: '0xa0604ebf2614ad708aeefa83f766fb25928dadb5ffb2f45028f5b4f1fa4d9358', + l1_transaction_hash: '0xfca8cc5440bffa8b975873c02bba3ff3380dd75fbc3260d10179e282cf72d6d4', + l1_transaction_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5', + l2_transaction_gas_limit: '405824', + l2_transaction_hash: '0xa0604ebf2614ad708aeefa83f766fb25928dadb5ffb2f45028f5b4f1fa4d9358', }, ], next_page_params: { items_count: 50, l1_block_number: 8382363, - tx_hash: '0x2012f0ce966ce6573e7826e9235f227edf5a2f8382b8d646c979f85a77e15c05', + transaction_hash: '0x2012f0ce966ce6573e7826e9235f227edf5a2f8382b8d646c979f85a77e15c05', }, }; diff --git a/mocks/optimism/outputRoots.ts b/mocks/optimism/outputRoots.ts index 9f21572297..0be0426fee 100644 --- a/mocks/optimism/outputRoots.ts +++ b/mocks/optimism/outputRoots.ts @@ -3,7 +3,7 @@ export const outputRootsData = { { l1_block_number: 8456113, l1_timestamp: '2022-02-08T12:08:48.000000Z', - l1_tx_hash: '0x19455a53758d5de89070164ff09c40d93f1b4447e721090f03aa150f6159265a', + l1_transaction_hash: '0x19455a53758d5de89070164ff09c40d93f1b4447e721090f03aa150f6159265a', l2_block_number: 5214988, l2_output_index: 9926, output_root: '0xa7de9bd3986ce5ca8de9f0ab6c7473f4cebe225fb13b57cc5c8472de84a8bab3', @@ -11,7 +11,7 @@ export const outputRootsData = { { l1_block_number: 8456099, l1_timestamp: '2022-02-08T12:05:24.000000Z', - l1_tx_hash: '0x6aa081e8e33a085e4ec7124fcd8a5f7d36aac0828f176e80d4b70e313a11695b', + l1_transaction_hash: '0x6aa081e8e33a085e4ec7124fcd8a5f7d36aac0828f176e80d4b70e313a11695b', l2_block_number: 5214868, l2_output_index: 9925, output_root: '0x4ec2822d2f7b4f834d693d88f8a4cf15899882915980a21756d29cfd9f9f3898', @@ -19,7 +19,7 @@ export const outputRootsData = { { l1_block_number: 8456078, l1_timestamp: '2022-02-08T12:00:48.000000Z', - l1_tx_hash: '0x4238988b0959e41a7b09cef67f58698e05e3bcc29b8d2f60e6c77dc68c91f16e', + l1_transaction_hash: '0x4238988b0959e41a7b09cef67f58698e05e3bcc29b8d2f60e6c77dc68c91f16e', l2_block_number: 5214748, l2_output_index: 9924, output_root: '0x78b2e13c20f4bbfb4a008127edaaf25aa476f933669edd4856305bf4ab64a92b', diff --git a/mocks/optimism/txnBatches.ts b/mocks/optimism/txnBatches.ts index e7306c6ae3..3344f6420d 100644 --- a/mocks/optimism/txnBatches.ts +++ b/mocks/optimism/txnBatches.ts @@ -11,33 +11,33 @@ export const txnBatchesData: OptimisticL2TxnBatchesResponse = { batch_data_container: 'in_blob4844', internal_id: 260998, l1_timestamp: '2022-11-10T11:29:11.000000Z', - l1_tx_hashes: [ + l1_transaction_hashes: [ '0x9553351f6bd1577f4e782738c087be08697fb11f3b91745138d71ba166d62c3b', ], l2_block_end: 124882074, l2_block_start: 124881833, - tx_count: 4011, + transaction_count: 4011, }, { batch_data_container: 'in_calldata', internal_id: 260997, l1_timestamp: '2022-11-03T11:20:59.000000Z', - l1_tx_hashes: [ + l1_transaction_hashes: [ '0x80f5fba70d5685bc2b70df836942e892b24afa7bba289a2fac0ca8f4d554cc72', ], l2_block_end: 124881832, l2_block_start: 124881613, - tx_count: 4206, + transaction_count: 4206, }, { internal_id: 260996, l1_timestamp: '2024-09-03T11:14:23.000000Z', - l1_tx_hashes: [ + l1_transaction_hashes: [ '0x39f4c46cae57bae936acb9159e367794f41f021ed3788adb80ad93830edb5f22', ], l2_block_end: 124881612, l2_block_start: 124881380, - tx_count: 4490, + transaction_count: 4490, }, ], next_page_params: { @@ -50,12 +50,12 @@ export const txnBatchTypeCallData: OptimismL2TxnBatchTypeCallData = { batch_data_container: 'in_calldata', internal_id: 309123, l1_timestamp: '2022-08-10T10:30:24.000000Z', - l1_tx_hashes: [ + l1_transaction_hashes: [ '0x478c45f182631ae6f7249d40f31fdac36f41d88caa2e373fba35340a7345ca67', ], l2_block_end: 10146784, l2_block_start: 10145379, - tx_count: 1608, + transaction_count: 1608, }; export const txnBatchTypeCelestia: OptimismL2TxnBatchTypeCelestia = { @@ -71,12 +71,12 @@ export const txnBatchTypeCelestia: OptimismL2TxnBatchTypeCelestia = { ], internal_id: 309667, l1_timestamp: '2022-08-28T16:51:12.000000Z', - l1_tx_hashes: [ + l1_transaction_hashes: [ '0x2bb0b96a8ba0f063a243ac3dee0b2f2d87edb2ba9ef44bfcbc8ed191af1c4c24', ], l2_block_end: 10935879, l2_block_start: 10934514, - tx_count: 1574, + transaction_count: 1574, }; export const txnBatchTypeEip4844: OptimismL2TxnBatchTypeEip4844 = { @@ -95,10 +95,10 @@ export const txnBatchTypeEip4844: OptimismL2TxnBatchTypeEip4844 = { ], internal_id: 2538459, l1_timestamp: '2022-08-23T03:59:12.000000Z', - l1_tx_hashes: [ + l1_transaction_hashes: [ '0x3870f136497e5501dc20d0974daf379c8636c958794d59a9c90d4f8a9f0ed20a', ], l2_block_end: 16291502, l2_block_start: 16291373, - tx_count: 704, + transaction_count: 704, }; diff --git a/mocks/optimism/withdrawals.ts b/mocks/optimism/withdrawals.ts index 046b467402..b9d9588cdc 100644 --- a/mocks/optimism/withdrawals.ts +++ b/mocks/optimism/withdrawals.ts @@ -15,9 +15,9 @@ export const data: OptimisticL2WithdrawalsResponse = { watchlist_names: [], ens_domain_name: null, }, - l1_tx_hash: '0x1a235bee32ac10cb7efdad98415737484ca66386e491cde9e17d42b136dca684', + l1_transaction_hash: '0x1a235bee32ac10cb7efdad98415737484ca66386e491cde9e17d42b136dca684', l2_timestamp: '2022-02-15T12:50:02.000000Z', - l2_tx_hash: '0x918cd8c5c24c17e06cd02b0379510c4ad56324bf153578fb9caaaa2fe4e7dc35', + l2_transaction_hash: '0x918cd8c5c24c17e06cd02b0379510c4ad56324bf153578fb9caaaa2fe4e7dc35', msg_nonce: 396, msg_nonce_version: 1, status: 'Ready to prove', @@ -25,9 +25,9 @@ export const data: OptimisticL2WithdrawalsResponse = { { challenge_period_end: null, from: null, - l1_tx_hash: null, + l1_transaction_hash: null, l2_timestamp: null, - l2_tx_hash: '0x2f117bee32ac10cb7efdad98415737484ca66386e491cde9e17d42b136def593', + l2_transaction_hash: '0x2f117bee32ac10cb7efdad98415737484ca66386e491cde9e17d42b136def593', msg_nonce: 391, msg_nonce_version: 1, status: 'Ready to prove', @@ -35,9 +35,9 @@ export const data: OptimisticL2WithdrawalsResponse = { { challenge_period_end: '2022-11-11T12:50:02.000000Z', from: null, - l1_tx_hash: null, + l1_transaction_hash: null, l2_timestamp: null, - l2_tx_hash: '0xe14b1f46838176702244a5343629bcecf728ca2d9881d47b4ce46e00c387d7e3', + l2_transaction_hash: '0xe14b1f46838176702244a5343629bcecf728ca2d9881d47b4ce46e00c387d7e3', msg_nonce: 390, msg_nonce_version: 1, status: 'Ready for relay', diff --git a/mocks/search/index.ts b/mocks/search/index.ts index 34015b5157..c0510f0225 100644 --- a/mocks/search/index.ts +++ b/mocks/search/index.ts @@ -114,7 +114,7 @@ export const label1: SearchResultLabel = { }; export const tx1: SearchResultTx = { - tx_hash: '0x349d4025d03c6faec117ee10ac0bce7c7a805dd2cbff7a9f101304d9a8a525dd', + transaction_hash: '0x349d4025d03c6faec117ee10ac0bce7c7a805dd2cbff7a9f101304d9a8a525dd', type: 'transaction' as const, timestamp: '2022-12-11T17:55:20Z', url: '/tx/0x349d4025d03c6faec117ee10ac0bce7c7a805dd2cbff7a9f101304d9a8a525dd', diff --git a/mocks/stats/daily_txs.ts b/mocks/stats/daily_txs.ts index afb2dcca58..76653e9240 100644 --- a/mocks/stats/daily_txs.ts +++ b/mocks/stats/daily_txs.ts @@ -2,148 +2,148 @@ export const base = { chart_data: [ { date: '2022-11-28', - tx_count: 26815, + transaction_count: 26815, }, { date: '2022-11-27', - tx_count: 34784, + transaction_count: 34784, }, { date: '2022-11-26', - tx_count: 77527, + transaction_count: 77527, }, { date: '2022-11-25', - tx_count: 39687, + transaction_count: 39687, }, { date: '2022-11-24', - tx_count: 40752, + transaction_count: 40752, }, { date: '2022-11-23', - tx_count: 32569, + transaction_count: 32569, }, { date: '2022-11-22', - tx_count: 34449, + transaction_count: 34449, }, { date: '2022-11-21', - tx_count: 106047, + transaction_count: 106047, }, { date: '2022-11-20', - tx_count: 107713, + transaction_count: 107713, }, { date: '2022-11-19', - tx_count: 96311, + transaction_count: 96311, }, { date: '2022-11-18', - tx_count: 30828, + transaction_count: 30828, }, { date: '2022-11-17', - tx_count: 27422, + transaction_count: 27422, }, { date: '2022-11-16', - tx_count: 75898, + transaction_count: 75898, }, { date: '2022-11-15', - tx_count: 84084, + transaction_count: 84084, }, { date: '2022-11-14', - tx_count: 62266, + transaction_count: 62266, }, { date: '2022-11-13', - tx_count: 22338, + transaction_count: 22338, }, { date: '2022-11-12', - tx_count: 86764, + transaction_count: 86764, }, { date: '2022-11-11', - tx_count: 79493, + transaction_count: 79493, }, { date: '2022-11-10', - tx_count: 92887, + transaction_count: 92887, }, { date: '2022-11-09', - tx_count: 43691, + transaction_count: 43691, }, { date: '2022-11-08', - tx_count: 74197, + transaction_count: 74197, }, { date: '2022-11-07', - tx_count: 58131, + transaction_count: 58131, }, { date: '2022-11-06', - tx_count: 62477, + transaction_count: 62477, }, { date: '2022-11-05', - tx_count: 82897, + transaction_count: 82897, }, { date: '2022-11-04', - tx_count: 91725, + transaction_count: 91725, }, { date: '2022-11-03', - tx_count: 83667, + transaction_count: 83667, }, { date: '2022-11-02', - tx_count: 63743, + transaction_count: 63743, }, { date: '2022-11-01', - tx_count: 152059, + transaction_count: 152059, }, { date: '2022-10-31', - tx_count: 62519, + transaction_count: 62519, }, { date: '2022-10-30', - tx_count: 48569, + transaction_count: 48569, }, { date: '2022-10-29', - tx_count: 36789, + transaction_count: 36789, }, ], }; export const partialData = { chart_data: [ - { date: '2022-11-28', tx_count: 26815 }, - { date: '2022-11-27', tx_count: 34784 }, - { date: '2022-11-26', tx_count: 77527 }, - { date: '2022-11-25', tx_count: null }, - { date: '2022-11-24', tx_count: null }, - { date: '2022-11-23', tx_count: null }, - { date: '2022-11-22', tx_count: 63433 }, - { date: '2022-11-21', tx_count: null }, + { date: '2022-11-28', transaction_count: 26815 }, + { date: '2022-11-27', transaction_count: 34784 }, + { date: '2022-11-26', transaction_count: 77527 }, + { date: '2022-11-25', transaction_count: null }, + { date: '2022-11-24', transaction_count: null }, + { date: '2022-11-23', transaction_count: null }, + { date: '2022-11-22', transaction_count: 63433 }, + { date: '2022-11-21', transaction_count: null }, ], }; export const noData = { chart_data: [ - { date: '2022-11-25', tx_count: null }, - { date: '2022-11-24', tx_count: null }, - { date: '2022-11-23', tx_count: null }, + { date: '2022-11-25', transaction_count: null }, + { date: '2022-11-24', transaction_count: null }, + { date: '2022-11-23', transaction_count: null }, ], }; diff --git a/mocks/tokens/tokenTransfer.ts b/mocks/tokens/tokenTransfer.ts index d6b93ad890..9638bcc885 100644 --- a/mocks/tokens/tokenTransfer.ts +++ b/mocks/tokens/tokenTransfer.ts @@ -39,7 +39,7 @@ export const erc20: TokenTransfer = { decimals: '18', value: '31567373703130350', }, - tx_hash: '0x62d597ebcf3e8d60096dd0363bc2f0f5e2df27ba1dacd696c51aa7c9409f3193', + transaction_hash: '0x62d597ebcf3e8d60096dd0363bc2f0f5e2df27ba1dacd696c51aa7c9409f3193', type: 'token_transfer', timestamp: '2022-10-10T14:34:30.000000Z', block_number: '12345', @@ -86,7 +86,7 @@ export const erc721: TokenTransfer = { total: { token_id: '875879856', }, - tx_hash: '0xf13bc7afe5e02b494dd2f22078381d36a4800ef94a0ccc147431db56c301e6cc', + transaction_hash: '0xf13bc7afe5e02b494dd2f22078381d36a4800ef94a0ccc147431db56c301e6cc', type: 'token_transfer', timestamp: '2022-10-10T14:34:30.000000Z', block_number: '12345', @@ -135,7 +135,7 @@ export const erc1155A: TokenTransfer = { value: '42', decimals: null, }, - tx_hash: '0x05d6589367633c032d757a69c5fb16c0e33e3994b0d9d1483f82aeee1f05d746', + transaction_hash: '0x05d6589367633c032d757a69c5fb16c0e33e3994b0d9d1483f82aeee1f05d746', type: 'token_minting', timestamp: '2022-10-10T14:34:30.000000Z', block_number: '12345', @@ -213,7 +213,7 @@ export const erc404A: TokenTransfer = { decimals: '18', token_id: null, }, - tx_hash: '0x05d6589367633c032d757a69c5fb16c0e33e3994b0d9d1483f82aeee1f05d746', + transaction_hash: '0x05d6589367633c032d757a69c5fb16c0e33e3994b0d9d1483f82aeee1f05d746', type: 'token_transfer', method: 'swap', timestamp: '2022-10-10T14:34:30.000000Z', diff --git a/mocks/zkEvm/txnBatches.ts b/mocks/zkEvm/txnBatches.ts index bcaf55d941..194148c16b 100644 --- a/mocks/zkEvm/txnBatches.ts +++ b/mocks/zkEvm/txnBatches.ts @@ -4,14 +4,14 @@ export const txnBatchData: ZkEvmL2TxnBatch = { acc_input_hash: '0x4bf88aabe33713b7817266d7860912c58272d808da7397cdc627ca53b296fad3', global_exit_root: '0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5', number: 5, - sequence_tx_hash: '0x7ae010e9758441b302db10282807358af460f38c49c618d26a897592f64977f7', + sequence_transaction_hash: '0x7ae010e9758441b302db10282807358af460f38c49c618d26a897592f64977f7', state_root: '0x183b4a38a4a6027947ceb93b323cc94c548c8c05cf605d73ca88351d77cae1a3', status: 'Finalized', timestamp: '2023-10-20T10:08:18.000000Z', transactions: [ '0xb5d432c270057c223b973f3b5f00dbad32823d9ef26f3e8d97c819c7c573453a', ], - verify_tx_hash: '0x6f7eeaa0eb966e63d127bba6bf8f9046d303c2a1185b542f0b5083f682a0e87f', + verify_transaction_hash: '0x6f7eeaa0eb966e63d127bba6bf8f9046d303c2a1185b542f0b5083f682a0e87f', }; export const txnBatchesData: ZkEvmL2TxnBatchesResponse = { @@ -19,18 +19,18 @@ export const txnBatchesData: ZkEvmL2TxnBatchesResponse = { { timestamp: '2023-06-01T14:46:48.000000Z', status: 'Finalized', - verify_tx_hash: '0x48139721f792d3a68c3781b4cf50e66e8fc7dbb38adff778e09066ea5be9adb8', - sequence_tx_hash: '0x6aa081e8e33a085e4ec7124fcd8a5f7d36aac0828f176e80d4b70e313a11695b', + verify_transaction_hash: '0x48139721f792d3a68c3781b4cf50e66e8fc7dbb38adff778e09066ea5be9adb8', + sequence_transaction_hash: '0x6aa081e8e33a085e4ec7124fcd8a5f7d36aac0828f176e80d4b70e313a11695b', number: 5218590, - tx_count: 9, + transaction_count: 9, }, { timestamp: '2023-06-01T14:46:48.000000Z', status: 'Unfinalized', - verify_tx_hash: null, - sequence_tx_hash: null, + verify_transaction_hash: null, + sequence_transaction_hash: null, number: 5218591, - tx_count: 9, + transaction_count: 9, }, ], next_page_params: { diff --git a/mocks/zkSync/zkSyncTxnBatch.ts b/mocks/zkSync/zkSyncTxnBatch.ts index ab865dc513..79c5e28b39 100644 --- a/mocks/zkSync/zkSyncTxnBatch.ts +++ b/mocks/zkSync/zkSyncTxnBatch.ts @@ -7,9 +7,9 @@ export const base: ZkSyncBatch = { execute_transaction_hash: '0x110b9a19afbabd5818a996ab2b493a9b23c888d73d95f1ab5272dbae503e103a', execute_transaction_timestamp: '2022-03-19T10:29:05.358066Z', l1_gas_price: '4173068062', - l1_tx_count: 0, + l1_transaction_count: 0, l2_fair_gas_price: '100000000', - l2_tx_count: 287, + l2_transaction_count: 287, number: 8051, prove_transaction_hash: '0xb424162ba5afe17c710dceb5fc8d15d7d46a66223454dae8c74aa39f6802625b', prove_transaction_timestamp: '2022-03-19T10:29:05.279179Z', diff --git a/mocks/zkSync/zkSyncTxnBatches.ts b/mocks/zkSync/zkSyncTxnBatches.ts index a717308641..9bd3188eca 100644 --- a/mocks/zkSync/zkSyncTxnBatches.ts +++ b/mocks/zkSync/zkSyncTxnBatches.ts @@ -10,7 +10,7 @@ export const sealed: ZkSyncBatchesItem = { prove_transaction_timestamp: null, status: 'Sealed on L2', timestamp: '2022-03-19T12:53:36.000000Z', - tx_count: 738, + transaction_count: 738, }; export const sent: ZkSyncBatchesItem = { @@ -23,7 +23,7 @@ export const sent: ZkSyncBatchesItem = { prove_transaction_timestamp: null, status: 'Sent to L1', timestamp: '2022-03-19T11:36:45.000000Z', - tx_count: 766, + transaction_count: 766, }; export const executed: ZkSyncBatchesItem = { @@ -36,7 +36,7 @@ export const executed: ZkSyncBatchesItem = { prove_transaction_timestamp: '2022-03-19T13:28:16.603104Z', status: 'Executed on L1', timestamp: '2022-03-19T10:01:52.000000Z', - tx_count: 1071, + transaction_count: 1071, }; export const baseResponse: ZkSyncBatchesResponse = { diff --git a/stubs/L2.ts b/stubs/L2.ts index de57edde7c..0fcd933e86 100644 --- a/stubs/L2.ts +++ b/stubs/L2.ts @@ -13,18 +13,18 @@ import { TX_HASH } from './tx'; export const L2_DEPOSIT_ITEM: OptimisticL2DepositsItem = { l1_block_number: 9045233, l1_block_timestamp: '2023-05-22T18:00:36.000000Z', - l1_tx_hash: TX_HASH, - l1_tx_origin: ADDRESS_HASH, - l2_tx_gas_limit: '100000', - l2_tx_hash: TX_HASH, + l1_transaction_hash: TX_HASH, + l1_transaction_origin: ADDRESS_HASH, + l2_transaction_gas_limit: '100000', + l2_transaction_hash: TX_HASH, }; export const L2_WITHDRAWAL_ITEM: OptimisticL2WithdrawalsItem = { challenge_period_end: null, from: ADDRESS_PARAMS, - l1_tx_hash: TX_HASH, + l1_transaction_hash: TX_HASH, l2_timestamp: '2023-06-01T13:44:56.000000Z', - l2_tx_hash: TX_HASH, + l2_transaction_hash: TX_HASH, msg_nonce: 2393, msg_nonce_version: 1, status: 'Ready to prove', @@ -34,12 +34,12 @@ export const L2_TXN_BATCHES_ITEM: OptimisticL2TxnBatchesItem = { internal_id: 260991, batch_data_container: 'in_blob4844', l1_timestamp: '2023-06-01T14:46:48.000000Z', - l1_tx_hashes: [ + l1_transaction_hashes: [ TX_HASH, ], l2_block_start: 5218590, l2_block_end: 5218777, - tx_count: 9, + transaction_count: 9, }; export const L2_TXN_BATCH: OptimismL2TxnBatch = { @@ -57,7 +57,7 @@ export const L2_TXN_BATCH: OptimismL2TxnBatch = { export const L2_OUTPUT_ROOTS_ITEM: OptimisticL2OutputRootsItem = { l1_block_number: 9103684, l1_timestamp: '2023-06-01T15:26:12.000000Z', - l1_tx_hash: TX_HASH, + l1_transaction_hash: TX_HASH, l2_block_number: 10102468, l2_output_index: 50655, output_root: TX_HASH, diff --git a/stubs/address.ts b/stubs/address.ts index 917837d1f6..acd1c1d03e 100644 --- a/stubs/address.ts +++ b/stubs/address.ts @@ -19,7 +19,7 @@ import { TX_HASH } from './tx'; export const ADDRESS_INFO: Address = { block_number_balance_updated_at: 8774377, coin_balance: '810941268802273085757', - creation_tx_hash: null, + creation_transaction_hash: null, creator_address_hash: ADDRESS_HASH, exchange_rate: null, has_decompiled_code: false, @@ -59,7 +59,7 @@ export const ADDRESS_TABS_COUNTERS: AddressTabsCounters = { export const TOP_ADDRESS: AddressesItem = { coin_balance: '11886682377162664596540805', - tx_count: '1835', + transaction_count: '1835', hash: '0x4f7A67464B5976d7547c860109e4432d50AfB38e', implementations: null, is_contract: false, diff --git a/stubs/block.ts b/stubs/block.ts index 99f96123dc..044843e0fd 100644 --- a/stubs/block.ts +++ b/stubs/block.ts @@ -31,8 +31,8 @@ export const BLOCK: Block = { state_root: 'TODO', timestamp: '2023-05-12T19:29:12.000000Z', total_difficulty: '10837812015930321201107455268036056402048391639', - tx_count: 142, - tx_fees: '19241635547777613', + transaction_count: 142, + transaction_fees: '19241635547777613', type: 'block', uncles_hashes: [], }; diff --git a/stubs/contract.ts b/stubs/contract.ts index 92b86ac2e7..cb9111cfdb 100644 --- a/stubs/contract.ts +++ b/stubs/contract.ts @@ -69,7 +69,7 @@ export const VERIFIED_CONTRACT_INFO: VerifiedContract = { language: 'solidity', market_cap: null, optimization_enabled: false, - tx_count: 565058, + transaction_count: 565058, verified_at: '2023-04-10T13:16:33.884921Z', license_type: 'mit', }; diff --git a/stubs/log.ts b/stubs/log.ts index 0200ba4d04..3e34dbcee5 100644 --- a/stubs/log.ts +++ b/stubs/log.ts @@ -31,5 +31,5 @@ export const LOG: Log = { '0x000000000000000000000000302fd86163cb9ad5533b3952dafa3b633a82bc51', null, ], - tx_hash: TX_HASH, + transaction_hash: TX_HASH, }; diff --git a/stubs/mud.ts b/stubs/mud.ts index d49db88913..f987149f32 100644 --- a/stubs/mud.ts +++ b/stubs/mud.ts @@ -20,5 +20,5 @@ export const MUD_SCHEMA: MudWorldSchema = { export const MUD_WORLD: MudWorldItem = { address: ADDRESS_PARAMS, coin_balance: '7072643779453701031672', - tx_count: 442, + transaction_count: 442, }; diff --git a/stubs/search.ts b/stubs/search.ts index 77d1662a89..079a7a542e 100644 --- a/stubs/search.ts +++ b/stubs/search.ts @@ -26,5 +26,5 @@ export const SEARCH_RESULT_NEXT_PAGE_PARAMS: SearchResult['next_page_params'] = items_count: 50, name: 'USDCTest', q: 'usd', - tx_hash: null, + transaction_hash: null, }; diff --git a/stubs/token.ts b/stubs/token.ts index 1449bcc0a7..9f489b1113 100644 --- a/stubs/token.ts +++ b/stubs/token.ts @@ -102,7 +102,7 @@ export const TOKEN_TRANSFER_ERC_20: TokenTransfer = { decimals: '18', value: '9851351626684503', }, - tx_hash: TX_HASH, + transaction_hash: TX_HASH, type: 'token_minting', }; diff --git a/stubs/zkEvmL2.ts b/stubs/zkEvmL2.ts index 46015e0ccf..3878230972 100644 --- a/stubs/zkEvmL2.ts +++ b/stubs/zkEvmL2.ts @@ -25,20 +25,20 @@ export const ZKEVM_WITHDRAWALS_ITEM: ZkEvmL2WithdrawalsItem = { export const ZKEVM_L2_TXN_BATCHES_ITEM: ZkEvmL2TxnBatchesItem = { timestamp: '2023-06-01T14:46:48.000000Z', status: 'Finalized', - verify_tx_hash: TX_HASH, - sequence_tx_hash: TX_HASH, + verify_transaction_hash: TX_HASH, + sequence_transaction_hash: TX_HASH, number: 5218590, - tx_count: 9, + transaction_count: 9, }; export const ZKEVM_L2_TXN_BATCH: ZkEvmL2TxnBatch = { acc_input_hash: '0xb815fe2832977f1324ad0124a019b938f189f7b470292f40a21284f15774b3b3', global_exit_root: '0x0000000000000000000000000000000000000000000000000000000000000000', number: 1, - sequence_tx_hash: '0x57b9b95db5f94f125710bdc8fbb3fabaac10125b44b0cb61dbc69daddf06d0cd', + sequence_transaction_hash: '0x57b9b95db5f94f125710bdc8fbb3fabaac10125b44b0cb61dbc69daddf06d0cd', state_root: '0xb9a589d6b3ae44d3b250a9993caa5e3721568197f56e4743989ecb2285d80ec4', status: 'Finalized', timestamp: '2023-09-15T06:22:48.000000Z', transactions: [ '0xff99dd67646b8f3d657cc6f19eb33abc346de2dbaccd03e45e7726cc28e3e186' ], - verify_tx_hash: '0x093276fa65c67d7b12dd96f4fefafba9d9ad2f1c23c6e53f96583971ce75352d', + verify_transaction_hash: '0x093276fa65c67d7b12dd96f4fefafba9d9ad2f1c23c6e53f96583971ce75352d', }; diff --git a/stubs/zkSyncL2.ts b/stubs/zkSyncL2.ts index 9d3782abcf..f8edd2c398 100644 --- a/stubs/zkSyncL2.ts +++ b/stubs/zkSyncL2.ts @@ -12,7 +12,7 @@ export const ZKSYNC_L2_TXN_BATCHES_ITEM: ZkSyncBatchesItem = { prove_transaction_timestamp: '2022-03-17T20:49:48.772442Z', status: 'Executed on L1', timestamp: '2022-03-17T17:00:11.000000Z', - tx_count: 1215, + transaction_count: 1215, }; export const ZKSYNC_L2_TXN_BATCH: ZkSyncBatch = { @@ -20,8 +20,8 @@ export const ZKSYNC_L2_TXN_BATCH: ZkSyncBatch = { start_block: 1245209, end_block: 1245490, l1_gas_price: '4173068062', - l1_tx_count: 0, + l1_transaction_count: 0, l2_fair_gas_price: '100000000', - l2_tx_count: 287, + l2_transaction_count: 287, root_hash: '0x108c635b94f941fcabcb85500daec2f6be4f0747dff649b1cdd9dd7a7a264792', }; diff --git a/types/api/account.ts b/types/api/account.ts index 4e755fe3db..af8f9f077c 100644 --- a/types/api/account.ts +++ b/types/api/account.ts @@ -141,7 +141,7 @@ export type AddressTagErrors = { } export type TransactionTagErrors = { - tx_hash: Array; + transaction_hash: Array; name: Array; identity_id?: Array; } diff --git a/types/api/address.ts b/types/api/address.ts index 3085ac8421..438e1b798c 100644 --- a/types/api/address.ts +++ b/types/api/address.ts @@ -12,7 +12,7 @@ export interface Address extends UserTags { coin_balance: string | null; creator_address_hash: string | null; creator_filecoin_robust_address?: string | null; - creation_tx_hash: string | null; + creation_transaction_hash: string | null; exchange_rate: string | null; ens_domain_name: string | null; filecoin?: AddressFilecoinParams; diff --git a/types/api/addresses.ts b/types/api/addresses.ts index 3533b67655..2aa774d0c1 100644 --- a/types/api/addresses.ts +++ b/types/api/addresses.ts @@ -1,6 +1,6 @@ import type { AddressParam } from './addressParams'; -export type AddressesItem = AddressParam & { tx_count: string; coin_balance: string | null } +export type AddressesItem = AddressParam & { transaction_count: string; coin_balance: string | null } export type AddressesResponse = { items: Array; diff --git a/types/api/block.ts b/types/api/block.ts index 2b4d5bc29c..3fc2336309 100644 --- a/types/api/block.ts +++ b/types/api/block.ts @@ -20,7 +20,7 @@ export interface BlockBaseFeeCelo { export interface Block { height: number; timestamp: string; - tx_count: number; + transaction_count: number; miner: AddressParam; size: number; hash: string; @@ -40,7 +40,7 @@ export interface Block { gas_used_percentage: number | null; burnt_fees_percentage: number | null; type: BlockType; - tx_fees: string | null; + transaction_fees: string | null; uncles_hashes: Array; withdrawals_count?: number; // ROOTSTOCK FIELDS @@ -56,7 +56,7 @@ export interface Block { excess_blob_gas?: string; blob_tx_count?: number; // ZKSYNC FIELDS - zksync?: Omit & { + zksync?: Omit & { 'batch_number': number | null; }; arbitrum?: ArbitrumBlockData; @@ -85,7 +85,7 @@ export interface OptimismBlockData { internal_id: number; blobs: Array | Array | null; l1_timestamp: string; - l1_tx_hashes: Array; + l1_transaction_hashes: Array; } export interface BlocksResponse { diff --git a/types/api/charts.ts b/types/api/charts.ts index a5504ded12..27aec385e5 100644 --- a/types/api/charts.ts +++ b/types/api/charts.ts @@ -1,6 +1,6 @@ export interface ChartTransactionItem { date: string; - tx_count: number | null; + transaction_count: number | null; } export interface ChartMarketItem { diff --git a/types/api/contracts.ts b/types/api/contracts.ts index 58d1bb4c22..f236fc62ac 100644 --- a/types/api/contracts.ts +++ b/types/api/contracts.ts @@ -9,7 +9,7 @@ export interface VerifiedContract { language: 'vyper' | 'yul' | 'solidity'; has_constructor_args: boolean; optimization_enabled: boolean; - tx_count: number | null; + transaction_count: number | null; verified_at: string; market_cap: string | null; license_type: SmartContractLicenseType | null; diff --git a/types/api/log.ts b/types/api/log.ts index eff0c95fa5..dffac19c4d 100644 --- a/types/api/log.ts +++ b/types/api/log.ts @@ -7,7 +7,7 @@ export interface Log { data: string; index: number; decoded: DecodedInput | null; - tx_hash: string | null; + transaction_hash: string | null; } export interface LogsResponseTx { diff --git a/types/api/mudWorlds.ts b/types/api/mudWorlds.ts index b9c5eb4d91..63e68e21b5 100644 --- a/types/api/mudWorlds.ts +++ b/types/api/mudWorlds.ts @@ -11,7 +11,7 @@ export type MudWorldsResponse = { export type MudWorldItem = { address: AddressParam; coin_balance: string; - tx_count: number | null; + transaction_count: number | null; } export type MudWorldSchema = { diff --git a/types/api/optimisticL2.ts b/types/api/optimisticL2.ts index 5c131f0d47..be766866c9 100644 --- a/types/api/optimisticL2.ts +++ b/types/api/optimisticL2.ts @@ -4,11 +4,11 @@ import type { Transaction } from './transaction'; export type OptimisticL2DepositsItem = { l1_block_number: number; - l1_tx_hash: string; + l1_transaction_hash: string; l1_block_timestamp: string; - l1_tx_origin: string; - l2_tx_gas_limit: string; - l2_tx_hash: string; + l1_transaction_origin: string; + l2_transaction_gas_limit: string; + l2_transaction_hash: string; } export type OptimisticL2DepositsResponse = { @@ -16,14 +16,14 @@ export type OptimisticL2DepositsResponse = { next_page_params: { items_count: number; l1_block_number: number; - tx_hash: string; + transaction_hash: string; }; } export type OptimisticL2OutputRootsItem = { l1_block_number: number; l1_timestamp: string; - l1_tx_hash: string; + l1_transaction_hash: string; l2_block_number: number; l2_output_index: number; output_root: string; @@ -43,10 +43,10 @@ export type OptimisticL2TxnBatchesItem = { internal_id: number; batch_data_container?: OptimisticL2BatchDataContainer; l1_timestamp: string; - l1_tx_hashes: Array; + l1_transaction_hashes: Array; l2_block_start: number; l2_block_end: number; - tx_count: number; + transaction_count: number; } export type OptimisticL2TxnBatchesResponse = { @@ -74,10 +74,10 @@ export interface OptimisticL2BlobTypeCelestia { interface OptimismL2TxnBatchBase { internal_id: number; l1_timestamp: string; - l1_tx_hashes: Array; + l1_transaction_hashes: Array; l2_block_start: number; l2_block_end: number; - tx_count: number; + transaction_count: number; } export interface OptimismL2TxnBatchTypeCallData extends OptimismL2TxnBatchBase { @@ -116,9 +116,9 @@ export type OptimismL2BatchBlocks = { export type OptimisticL2WithdrawalsItem = { 'challenge_period_end': string | null; 'from': AddressParam | null; - 'l1_tx_hash': string | null; + 'l1_transaction_hash': string | null; 'l2_timestamp': string | null; - 'l2_tx_hash': string; + 'l2_transaction_hash': string; 'msg_nonce': number; 'msg_nonce_version': number; 'status': string; diff --git a/types/api/search.ts b/types/api/search.ts index 7572c60060..36eccef9e6 100644 --- a/types/api/search.ts +++ b/types/api/search.ts @@ -69,7 +69,7 @@ export interface SearchResultBlock { export interface SearchResultTx { type: 'transaction'; - tx_hash: string; + transaction_hash: string; timestamp: string; url?: string; // not used by the frontend, we build the url ourselves } @@ -101,7 +101,7 @@ export interface SearchResult { 'items_count': number; 'name': string; 'q': string; - 'tx_hash': string | null; + 'transaction_hash': string | null; } | null; } diff --git a/types/api/tokenTransfer.ts b/types/api/tokenTransfer.ts index 9e970335f1..e7e655f30e 100644 --- a/types/api/tokenTransfer.ts +++ b/types/api/tokenTransfer.ts @@ -47,7 +47,7 @@ export type TokenTotal = Erc20TotalPayload | Erc721TotalPayload | Erc1155TotalPa interface TokenTransferBase { type: 'token_transfer' | 'token_burning' | 'token_spawning' | 'token_minting'; - tx_hash: string; + transaction_hash: string; from: AddressParam; to: AddressParam; timestamp: string; diff --git a/types/api/transaction.ts b/types/api/transaction.ts index 782120bb50..0f0ee3ed7e 100644 --- a/types/api/transaction.ts +++ b/types/api/transaction.ts @@ -87,7 +87,7 @@ export type Transaction = { zkevm_status?: typeof ZKEVM_L2_TX_STATUSES[number]; zkevm_sequence_hash?: string; // zkSync FIELDS - zksync?: Omit & { + zksync?: Omit & { 'batch_number': number | null; }; // blob tx fields diff --git a/types/api/zkEvmL2.ts b/types/api/zkEvmL2.ts index 04ebc265c0..42dd28de16 100644 --- a/types/api/zkEvmL2.ts +++ b/types/api/zkEvmL2.ts @@ -38,11 +38,11 @@ export type ZkEvmL2WithdrawalsResponse = { export type ZkEvmL2TxnBatchesItem = { number: number; - verify_tx_hash: string | null; - sequence_tx_hash: string | null; + verify_transaction_hash: string | null; + sequence_transaction_hash: string | null; status: string; timestamp: string | null; - tx_count: number; + transaction_count: number; } export type ZkEvmL2TxnBatchesResponse = { @@ -59,12 +59,12 @@ export type ZkEvmL2TxnBatch = { acc_input_hash: string; global_exit_root: string; number: number; - sequence_tx_hash: string; + sequence_transaction_hash: string; state_root: string; status: typeof ZKEVM_L2_TX_BATCH_STATUSES[number]; timestamp: string | null; transactions: Array; - verify_tx_hash: string; + verify_transaction_hash: string; } export type ZkEvmL2TxnBatchTxs = { diff --git a/types/api/zkSyncL2.ts b/types/api/zkSyncL2.ts index 4d038477ff..ee00b8f8b9 100644 --- a/types/api/zkSyncL2.ts +++ b/types/api/zkSyncL2.ts @@ -20,7 +20,7 @@ export interface ZkSyncBatchesItem { prove_transaction_timestamp: string | null; status: ZkSyncBatchStatus; timestamp: string; - tx_count: number; + transaction_count: number; } export type ZkSyncBatchesResponse = { @@ -31,13 +31,13 @@ export type ZkSyncBatchesResponse = { } | null; } -export interface ZkSyncBatch extends Omit { +export interface ZkSyncBatch extends Omit { start_block: number; end_block: number; l1_gas_price: string; - l1_tx_count: number; + l1_transaction_count: number; l2_fair_gas_price: string; - l2_tx_count: number; + l2_transaction_count: number; root_hash: string; } diff --git a/ui/address/AddressDetails.tsx b/ui/address/AddressDetails.tsx index 9396c2fe88..f17c0072e6 100644 --- a/ui/address/AddressDetails.tsx +++ b/ui/address/AddressDetails.tsx @@ -58,7 +58,7 @@ const AddressDetails = ({ addressQuery, scrollRef }: Props) => { token: null, watchlist_address_id: null, watchlist_names: null, - creation_tx_hash: null, + creation_transaction_hash: null, block_number_balance_updated_at: null, name: null, exchange_rate: null, @@ -147,7 +147,7 @@ const AddressDetails = ({ addressQuery, scrollRef }: Props) => { - { data.is_contract && data.creation_tx_hash && (creatorAddressHash) && ( + { data.is_contract && data.creation_transaction_hash && (creatorAddressHash) && ( <> { noIcon /> at txn - + ) } diff --git a/ui/address/blocksValidated/AddressBlocksValidatedListItem.tsx b/ui/address/blocksValidated/AddressBlocksValidatedListItem.tsx index 70f35d8ebc..fc3d6f6050 100644 --- a/ui/address/blocksValidated/AddressBlocksValidatedListItem.tsx +++ b/ui/address/blocksValidated/AddressBlocksValidatedListItem.tsx @@ -40,7 +40,7 @@ const AddressBlocksValidatedListItem = (props: Props) => { Txn - { props.tx_count } + { props.transaction_count } diff --git a/ui/address/blocksValidated/AddressBlocksValidatedTableItem.tsx b/ui/address/blocksValidated/AddressBlocksValidatedTableItem.tsx index e4bce7e860..296eb00567 100644 --- a/ui/address/blocksValidated/AddressBlocksValidatedTableItem.tsx +++ b/ui/address/blocksValidated/AddressBlocksValidatedTableItem.tsx @@ -41,7 +41,7 @@ const AddressBlocksValidatedTableItem = (props: Props) => { - { props.tx_count } + { props.transaction_count } diff --git a/ui/address/utils/useAddressQuery.ts b/ui/address/utils/useAddressQuery.ts index 64a43cb581..3f1ae73929 100644 --- a/ui/address/utils/useAddressQuery.ts +++ b/ui/address/utils/useAddressQuery.ts @@ -72,7 +72,7 @@ export default function useAddressQuery({ hash, isEnabled = true }: Params): Add block_number_balance_updated_at: null, coin_balance: balance.toString(), creator_address_hash: null, - creation_tx_hash: null, + creation_transaction_hash: null, exchange_rate: null, ens_domain_name: null, has_decompiled_code: false, diff --git a/ui/addresses/AddressesListItem.tsx b/ui/addresses/AddressesListItem.tsx index 462db87c80..f0f1dc1a9b 100644 --- a/ui/addresses/AddressesListItem.tsx +++ b/ui/addresses/AddressesListItem.tsx @@ -61,7 +61,7 @@ const AddressesListItem = ({ Txn count - { Number(item.tx_count).toLocaleString() } + { Number(item.transaction_count).toLocaleString() } diff --git a/ui/addresses/AddressesTableItem.tsx b/ui/addresses/AddressesTableItem.tsx index 06d849c211..fcc97e613b 100644 --- a/ui/addresses/AddressesTableItem.tsx +++ b/ui/addresses/AddressesTableItem.tsx @@ -60,7 +60,7 @@ const AddressesTableItem = ({ ) } - { Number(item.tx_count).toLocaleString() } + { Number(item.transaction_count).toLocaleString() } diff --git a/ui/addressesLabelSearch/AddressesLabelSearchListItem.tsx b/ui/addressesLabelSearch/AddressesLabelSearchListItem.tsx index f2145f93c7..1e8ffa7461 100644 --- a/ui/addressesLabelSearch/AddressesLabelSearchListItem.tsx +++ b/ui/addressesLabelSearch/AddressesLabelSearchListItem.tsx @@ -38,7 +38,7 @@ const AddressesLabelSearchListItem = ({ Txn count - { Number(item.tx_count).toLocaleString() } + { Number(item.transaction_count).toLocaleString() } diff --git a/ui/addressesLabelSearch/AddressesLabelSearchTableItem.tsx b/ui/addressesLabelSearch/AddressesLabelSearchTableItem.tsx index b768a56783..ade9627ff2 100644 --- a/ui/addressesLabelSearch/AddressesLabelSearchTableItem.tsx +++ b/ui/addressesLabelSearch/AddressesLabelSearchTableItem.tsx @@ -38,7 +38,7 @@ const AddressesLabelSearchTableItem = ({ - { Number(item.tx_count).toLocaleString() } + { Number(item.transaction_count).toLocaleString() } diff --git a/ui/block/BlockDetails.tsx b/ui/block/BlockDetails.tsx index 563dfc8d1b..12857f2b36 100644 --- a/ui/block/BlockDetails.tsx +++ b/ui/block/BlockDetails.tsx @@ -122,7 +122,7 @@ const BlockDetails = ({ query }: Props) => { const txsNum = (() => { const blockTxsNum = ( - { data.tx_count } txn{ data.tx_count === 1 ? '' : 's' } + { data.transaction_count } txn{ data.transaction_count === 1 ? '' : 's' } ); diff --git a/ui/block/useBlockQuery.tsx b/ui/block/useBlockQuery.tsx index 5d60edc7b4..c2861c2b81 100644 --- a/ui/block/useBlockQuery.tsx +++ b/ui/block/useBlockQuery.tsx @@ -65,7 +65,7 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery { return { height: Number(block.number), timestamp: dayjs.unix(Number(block.timestamp)).format(), - tx_count: block.transactions.length, + transaction_count: block.transactions.length, miner: { ...unknownAddress, hash: block.miner }, size: Number(block.size), hash: block.hash, @@ -84,7 +84,7 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery { gas_used_percentage: null, burnt_fees_percentage: null, type: 'block', // we can't get this type from RPC, so it will always be a regular block - tx_fees: null, + transaction_fees: null, uncles_hashes: block.uncles, withdrawals_count: block.withdrawals?.length, }; diff --git a/ui/blocks/BlocksListItem.tsx b/ui/blocks/BlocksListItem.tsx index d93b3f3ce1..8243942f2b 100644 --- a/ui/blocks/BlocksListItem.tsx +++ b/ui/blocks/BlocksListItem.tsx @@ -34,7 +34,7 @@ const isRollup = config.features.rollup.isEnabled; const BlocksListItem = ({ data, isLoading, enableTimeIncrement }: Props) => { const totalReward = getBlockTotalReward(data); const burntFees = BigNumber(data.burnt_fees || 0); - const txFees = BigNumber(data.tx_fees || 0); + const txFees = BigNumber(data.transaction_fees || 0); const baseFeeValue = getBaseFeeValue(data.base_fee_per_gas); return ( @@ -81,14 +81,14 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement }: Props) => { ) } Txn - { data.tx_count > 0 ? ( + { data.transaction_count > 0 ? ( - { data.tx_count } + { data.transaction_count } ) : - { data.tx_count } + { data.transaction_count } } diff --git a/ui/blocks/BlocksTableItem.tsx b/ui/blocks/BlocksTableItem.tsx index f0c0080d41..2cbb3c8318 100644 --- a/ui/blocks/BlocksTableItem.tsx +++ b/ui/blocks/BlocksTableItem.tsx @@ -31,7 +31,7 @@ const isRollup = config.features.rollup.isEnabled; const BlocksTableItem = ({ data, isLoading, enableTimeIncrement }: Props) => { const totalReward = getBlockTotalReward(data); const burntFees = BigNumber(data.burnt_fees || 0); - const txFees = BigNumber(data.tx_fees || 0); + const txFees = BigNumber(data.transaction_fees || 0); const burntFeesIconColor = useColorModeValue('gray.500', 'inherit'); @@ -89,16 +89,16 @@ const BlocksTableItem = ({ data, isLoading, enableTimeIncrement }: Props) => { ) } - { data.tx_count > 0 ? ( + { data.transaction_count > 0 ? ( - { data.tx_count } + { data.transaction_count } - ) : data.tx_count } + ) : data.transaction_count } { BigNumber(data.gas_used || 0).toFormat() } diff --git a/ui/deposits/optimisticL2/OptimisticDepositsListItem.tsx b/ui/deposits/optimisticL2/OptimisticDepositsListItem.tsx index 94cdd9e2f9..7c1564735d 100644 --- a/ui/deposits/optimisticL2/OptimisticDepositsListItem.tsx +++ b/ui/deposits/optimisticL2/OptimisticDepositsListItem.tsx @@ -39,7 +39,7 @@ const OptimisticDepositsListItem = ({ item, isLoading }: Props) => { { { L1 txn origin { Gas limit - { BigNumber(item.l2_tx_gas_limit).toFormat() } + { BigNumber(item.l2_transaction_gas_limit).toFormat() } diff --git a/ui/deposits/optimisticL2/OptimisticDepositsTable.tsx b/ui/deposits/optimisticL2/OptimisticDepositsTable.tsx index e8c24c1fec..73cc440205 100644 --- a/ui/deposits/optimisticL2/OptimisticDepositsTable.tsx +++ b/ui/deposits/optimisticL2/OptimisticDepositsTable.tsx @@ -28,7 +28,7 @@ const OptimisticDepositsTable = ({ items, top, isLoading }: Props) => { { items.map((item, index) => ( - + )) } diff --git a/ui/deposits/optimisticL2/OptimisticDepositsTableItem.tsx b/ui/deposits/optimisticL2/OptimisticDepositsTableItem.tsx index 2284839a18..299509a4a9 100644 --- a/ui/deposits/optimisticL2/OptimisticDepositsTableItem.tsx +++ b/ui/deposits/optimisticL2/OptimisticDepositsTableItem.tsx @@ -36,7 +36,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => { { { { - { BigNumber(item.l2_tx_gas_limit).toFormat() } + { BigNumber(item.l2_transaction_gas_limit).toFormat() } diff --git a/ui/home/LatestBlocksItem.tsx b/ui/home/LatestBlocksItem.tsx index 54419c2e0d..8fecf3c99d 100644 --- a/ui/home/LatestBlocksItem.tsx +++ b/ui/home/LatestBlocksItem.tsx @@ -67,7 +67,7 @@ const LatestBlocksItem = ({ block, isLoading }: Props) => { Txn - { block.tx_count } + { block.transaction_count } { !config.features.rollup.isEnabled && !config.UI.views.block.hiddenFields?.total_reward && ( <> diff --git a/ui/home/indicators/utils/indicators.tsx b/ui/home/indicators/utils/indicators.tsx index bdef67210a..4ee4cb0f22 100644 --- a/ui/home/indicators/utils/indicators.tsx +++ b/ui/home/indicators/utils/indicators.tsx @@ -30,7 +30,7 @@ const dailyTxsIndicator: TChainIndicator<'stats_charts_txs'> = { resourceName: 'stats_charts_txs', dataFn: (response) => ([ { items: response.chart_data - .map((item) => ({ date: new Date(item.date), value: item.tx_count })) + .map((item) => ({ date: new Date(item.date), value: item.transaction_count })) .sort(sortByDateDesc) .reduceRight(nonNullTailReducer, [] as Array) .map(mapNullToZero), diff --git a/ui/home/latestBatches/LatestZkEvmL2Batches.tsx b/ui/home/latestBatches/LatestZkEvmL2Batches.tsx index 02a74584ee..7297194dd2 100644 --- a/ui/home/latestBatches/LatestZkEvmL2Batches.tsx +++ b/ui/home/latestBatches/LatestZkEvmL2Batches.tsx @@ -70,7 +70,7 @@ const LatestZkEvmL2Batches = () => { { return ( ( - { l1BlockNumber: item.l1_block_number, l1TxHash: item.l1_tx_hash, l2TxHash: item.l2_tx_hash, timestamp: item.l1_block_timestamp } + { l1BlockNumber: item.l1_block_number, l1TxHash: item.l1_transaction_hash, l2TxHash: item.l2_transaction_hash, timestamp: item.l1_block_timestamp } )) } isLoading={ isPlaceholderData } socketItemsNum={ num } diff --git a/ui/mudWorlds/MudWorldsListItem.tsx b/ui/mudWorlds/MudWorldsListItem.tsx index 94ec895716..e349eeff33 100644 --- a/ui/mudWorlds/MudWorldsListItem.tsx +++ b/ui/mudWorlds/MudWorldsListItem.tsx @@ -39,7 +39,7 @@ const MudWorldsListItem = ({ Txn count - { Number(item.tx_count).toLocaleString() } + { Number(item.transaction_count).toLocaleString() } diff --git a/ui/mudWorlds/MudWorldsTableItem.tsx b/ui/mudWorlds/MudWorldsTableItem.tsx index b9f17e3b04..c2a0e1ab73 100644 --- a/ui/mudWorlds/MudWorldsTableItem.tsx +++ b/ui/mudWorlds/MudWorldsTableItem.tsx @@ -26,7 +26,7 @@ const MudWorldsTableItem = ({ item, isLoading }: Props) => { - { Number(item.tx_count).toLocaleString() } + { Number(item.transaction_count).toLocaleString() } diff --git a/ui/outputRoots/optimisticL2/OptimisticL2OutputRootsListItem.tsx b/ui/outputRoots/optimisticL2/OptimisticL2OutputRootsListItem.tsx index 76140ce1f6..51bf962945 100644 --- a/ui/outputRoots/optimisticL2/OptimisticL2OutputRootsListItem.tsx +++ b/ui/outputRoots/optimisticL2/OptimisticL2OutputRootsListItem.tsx @@ -52,7 +52,7 @@ const OptimisticL2OutputRootsListItem = ({ item, isLoading }: Props) => { { { next_page_params: { items_count: 50, l1_block_number: 9045200, - tx_hash: '', + transaction_hash: '', }, }, ), @@ -42,7 +42,7 @@ const OptimisticL2Deposits = () => { { data.items.map(((item, index) => ( diff --git a/ui/pages/SearchResults.pw.tsx b/ui/pages/SearchResults.pw.tsx index e469d9ee56..09855a6da8 100644 --- a/ui/pages/SearchResults.pw.tsx +++ b/ui/pages/SearchResults.pw.tsx @@ -87,14 +87,14 @@ test('search by block hash +@mobile', async({ render, mockApiResponse }) => { test('search by tx hash +@mobile', async({ render, mockApiResponse }) => { const hooksConfig = { router: { - query: { q: searchMock.tx1.tx_hash }, + query: { q: searchMock.tx1.transaction_hash }, }, }; const data = { items: [ searchMock.tx1 ], next_page_params: null, }; - await mockApiResponse('search', data, { queryParams: { q: searchMock.tx1.tx_hash } }); + await mockApiResponse('search', data, { queryParams: { q: searchMock.tx1.transaction_hash } }); const component = await render(, { hooksConfig }); await expect(component.locator('main')).toHaveScreenshot(); @@ -169,7 +169,7 @@ test.describe('with apps', () => { items_count: 1, name: 'foo', q: 'o', - tx_hash: null, + transaction_hash: null, }, }; await mockEnvs([ diff --git a/ui/pages/TokenTransfers.tsx b/ui/pages/TokenTransfers.tsx index 21388ce850..e321181afb 100644 --- a/ui/pages/TokenTransfers.tsx +++ b/ui/pages/TokenTransfers.tsx @@ -37,7 +37,7 @@ const TokenTransfers = () => { { tokenTransfersQuery.data?.items.map((item, index) => ( diff --git a/ui/privateTags/TransactionModal/TransactionForm.tsx b/ui/privateTags/TransactionModal/TransactionForm.tsx index 654350daab..b62c10ab1c 100644 --- a/ui/privateTags/TransactionModal/TransactionForm.tsx +++ b/ui/privateTags/TransactionModal/TransactionForm.tsx @@ -64,8 +64,8 @@ const TransactionForm: React.FC = ({ data, onClose, onSuccess, setAlertVi onError: (error: ResourceErrorAccount) => { setPending(false); const errorMap = error.payload?.errors; - if (errorMap?.tx_hash || errorMap?.name) { - errorMap?.tx_hash && formApi.setError('transaction', { type: 'custom', message: getErrorMessage(errorMap, 'tx_hash') }); + if (errorMap?.transaction_hash || errorMap?.name) { + errorMap?.transaction_hash && formApi.setError('transaction', { type: 'custom', message: getErrorMessage(errorMap, 'transaction_hash') }); errorMap?.name && formApi.setError('tag', { type: 'custom', message: getErrorMessage(errorMap, 'name') }); } else if (errorMap?.identity_id) { formApi.setError('transaction', { type: 'custom', message: getErrorMessage(errorMap, 'identity_id') }); diff --git a/ui/searchResults/SearchResultListItem.tsx b/ui/searchResults/SearchResultListItem.tsx index 464df8f36c..300b96a6b2 100644 --- a/ui/searchResults/SearchResultListItem.tsx +++ b/ui/searchResults/SearchResultListItem.tsx @@ -203,12 +203,12 @@ const SearchResultListItem = ({ data, searchTerm, isLoading, addressFormat }: Pr { data.map((item, index) => ( ( { topics={ TOPICS } data={ DATA } type="transaction" - tx_hash={ null } + transaction_hash={ null } />, ); await expect(component).toHaveScreenshot(); @@ -38,7 +38,7 @@ test('without decoded input data +@mobile', async({ render }) => { topics={ TOPICS } data={ DATA } type="transaction" - tx_hash={ null } + transaction_hash={ null } />, ); await expect(component).toHaveScreenshot(); diff --git a/ui/shared/logs/LogItem.tsx b/ui/shared/logs/LogItem.tsx index f74fbf1300..741c84d5c9 100644 --- a/ui/shared/logs/LogItem.tsx +++ b/ui/shared/logs/LogItem.tsx @@ -23,7 +23,7 @@ const RowHeader = ({ children, isLoading }: { children: React.ReactNode; isLoadi ); -const LogItem = ({ address, index, topics, data, decoded, type, tx_hash: txHash, isLoading }: Props) => { +const LogItem = ({ address, index, topics, data, decoded, type, transaction_hash: txHash, isLoading }: Props) => { const borderColor = useColorModeValue('blackAlpha.200', 'whiteAlpha.200'); const dataBgColor = useColorModeValue('blackAlpha.50', 'whiteAlpha.50'); diff --git a/ui/snippets/searchBar/SearchBar.pw.tsx b/ui/snippets/searchBar/SearchBar.pw.tsx index 4189e113e5..5754accd80 100644 --- a/ui/snippets/searchBar/SearchBar.pw.tsx +++ b/ui/snippets/searchBar/SearchBar.pw.tsx @@ -103,9 +103,9 @@ test('search by block hash +@mobile', async({ render, page, mockApiResponse }) = test('search by tx hash +@mobile', async({ render, page, mockApiResponse }) => { const apiUrl = await mockApiResponse('quick_search', [ searchMock.tx1, - ], { queryParams: { q: searchMock.tx1.tx_hash } }); + ], { queryParams: { q: searchMock.tx1.transaction_hash } }); await render(); - await page.getByPlaceholder(/search/i).fill(searchMock.tx1.tx_hash); + await page.getByPlaceholder(/search/i).fill(searchMock.tx1.transaction_hash); await page.waitForResponse(apiUrl); await expect(page).toHaveScreenshot({ clip: { x: 0, y: 0, width: 1200, height: 300 } }); @@ -140,9 +140,9 @@ test('search by user op hash +@mobile', async({ render, page, mockApiResponse, m await mockEnvs(ENVS_MAP.userOps); const apiUrl = await mockApiResponse('quick_search', [ searchMock.userOp1, - ], { queryParams: { q: searchMock.tx1.tx_hash } }); + ], { queryParams: { q: searchMock.tx1.transaction_hash } }); await render(); - await page.getByPlaceholder(/search/i).fill(searchMock.tx1.tx_hash); + await page.getByPlaceholder(/search/i).fill(searchMock.tx1.transaction_hash); await page.waitForResponse(apiUrl); await expect(page).toHaveScreenshot({ clip: { x: 0, y: 0, width: 1200, height: 300 } }); diff --git a/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggestItem.tsx b/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggestItem.tsx index 7b8af1ef21..9ca6c35fb8 100644 --- a/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggestItem.tsx +++ b/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggestItem.tsx @@ -38,7 +38,7 @@ const SearchBarSuggestItem = ({ data, isMobile, searchTerm, onClick, addressForm return route({ pathname: '/address/[hash]', query: { hash: data.address } }); } case 'transaction': { - return route({ pathname: '/tx/[hash]', query: { hash: data.tx_hash } }); + return route({ pathname: '/tx/[hash]', query: { hash: data.transaction_hash } }); } case 'block': { const isFutureBlock = data.timestamp === undefined; diff --git a/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggestTx.tsx b/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggestTx.tsx index f6572d2e98..4488d9da34 100644 --- a/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggestTx.tsx +++ b/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggestTx.tsx @@ -12,7 +12,7 @@ const SearchBarSuggestTx = ({ data, isMobile }: ItemsProps) => { const icon = ; const hash = ( - + ); const date = dayjs(data.timestamp).format('llll'); diff --git a/ui/token/TokenTransfer/TokenTransferList.tsx b/ui/token/TokenTransfer/TokenTransferList.tsx index cbf87e3f54..abd2fd38fe 100644 --- a/ui/token/TokenTransfer/TokenTransferList.tsx +++ b/ui/token/TokenTransfer/TokenTransferList.tsx @@ -16,7 +16,7 @@ const TokenTransferList = ({ data, tokenId, isLoading }: Props) => { { data.map((item, index) => ( ( { Txn hash - + Age diff --git a/ui/tokenTransfers/TokenTransfersTable.tsx b/ui/tokenTransfers/TokenTransfersTable.tsx index 00f1abdfa2..4e812d0f41 100644 --- a/ui/tokenTransfers/TokenTransfersTable.tsx +++ b/ui/tokenTransfers/TokenTransfersTable.tsx @@ -30,7 +30,7 @@ const TokenTransferTable = ({ items, top, isLoading }: Props) => { { items?.map((item, index) => ( diff --git a/ui/tokenTransfers/TokenTransfersTableItem.tsx b/ui/tokenTransfers/TokenTransfersTableItem.tsx index 34cb214d2e..72ab270b38 100644 --- a/ui/tokenTransfers/TokenTransfersTableItem.tsx +++ b/ui/tokenTransfers/TokenTransfersTableItem.tsx @@ -31,7 +31,7 @@ const TokenTransferTableItem = ({ item, isLoading }: Props) => { { - { data.tx_count.toLocaleString() } transaction{ data.tx_count === 1 ? '' : 's' } + { data.transaction_count.toLocaleString() } transaction{ data.transaction_count === 1 ? '' : 's' } { ' ' }in this batch @@ -137,7 +137,7 @@ const OptimisticL2TxnBatchDetails = ({ query }: Props) => { } { data.batch_data_container === 'in_calldata' && ( diff --git a/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesListItem.tsx b/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesListItem.tsx index 8fe492e150..f98da1de48 100644 --- a/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesListItem.tsx +++ b/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesListItem.tsx @@ -52,7 +52,7 @@ const OptimisticL2TxnBatchesListItem = ({ item, isLoading }: Props) => { L1 txn count - { item.l1_tx_hashes.length } + { item.l1_transaction_hashes.length } @@ -75,7 +75,7 @@ const OptimisticL2TxnBatchesListItem = ({ item, isLoading }: Props) => { isLoading={ isLoading } > - { item.tx_count } + { item.transaction_count } diff --git a/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesTableItem.tsx b/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesTableItem.tsx index 8397e5f729..acc9476006 100644 --- a/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesTableItem.tsx +++ b/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesTableItem.tsx @@ -39,7 +39,7 @@ const OptimisticL2TxnBatchesTableItem = ({ item, isLoading }: Props) => { - { item.l1_tx_hashes.length } + { item.l1_transaction_hashes.length } @@ -60,7 +60,7 @@ const OptimisticL2TxnBatchesTableItem = ({ item, isLoading }: Props) => { justifyContent="flex-end" > - { item.tx_count } + { item.transaction_count } diff --git a/ui/txnBatches/zkEvmL2/ZkEvmL2TxnBatchDetails.tsx b/ui/txnBatches/zkEvmL2/ZkEvmL2TxnBatchDetails.tsx index 5c45f1ac92..871d21da7e 100644 --- a/ui/txnBatches/zkEvmL2/ZkEvmL2TxnBatchDetails.tsx +++ b/ui/txnBatches/zkEvmL2/ZkEvmL2TxnBatchDetails.tsx @@ -104,10 +104,10 @@ const ZkEvmL2TxnBatchDetails = ({ query }: Props) => { Verify tx hash - { data.verify_tx_hash ? ( + { data.verify_transaction_hash ? ( ) : Pending } @@ -162,10 +162,10 @@ const ZkEvmL2TxnBatchDetails = ({ query }: Props) => { Sequence tx hash - { data.sequence_tx_hash ? ( + { data.sequence_transaction_hash ? ( ) : Pending } diff --git a/ui/txnBatches/zkEvmL2/ZkEvmTxnBatchesListItem.tsx b/ui/txnBatches/zkEvmL2/ZkEvmTxnBatchesListItem.tsx index 43be4e0fd7..3804175b1b 100644 --- a/ui/txnBatches/zkEvmL2/ZkEvmTxnBatchesListItem.tsx +++ b/ui/txnBatches/zkEvmL2/ZkEvmTxnBatchesListItem.tsx @@ -59,17 +59,17 @@ const ZkEvmTxnBatchesListItem = ({ item, isLoading }: Props) => { fontWeight={ 600 } > - { item.tx_count } + { item.transaction_count } Verify tx hash - { item.verify_tx_hash ? ( + { item.verify_transaction_hash ? ( { Sequence hash - { item.sequence_tx_hash ? ( + { item.sequence_transaction_hash ? ( { isLoading={ isLoading } > - { item.tx_count } + { item.transaction_count } - { item.verify_tx_hash ? ( + { item.verify_transaction_hash ? ( { ) : Pending } - { item.sequence_tx_hash ? ( + { item.sequence_transaction_hash ? ( { return null; } - const txNum = data.l2_tx_count + data.l1_tx_count; + const txNum = data.l2_transaction_count + data.l1_transaction_count; return ( { fontWeight={ 600 } > - { item.tx_count } + { item.transaction_count } diff --git a/ui/txnBatches/zkSyncL2/ZkSyncTxnBatchesTableItem.tsx b/ui/txnBatches/zkSyncL2/ZkSyncTxnBatchesTableItem.tsx index 282dd598c7..faabe873a6 100644 --- a/ui/txnBatches/zkSyncL2/ZkSyncTxnBatchesTableItem.tsx +++ b/ui/txnBatches/zkSyncL2/ZkSyncTxnBatchesTableItem.tsx @@ -50,7 +50,7 @@ const ZkSyncTxnBatchesTableItem = ({ item, isLoading }: Props) => { isLoading={ isLoading } > - { item.tx_count } + { item.transaction_count } diff --git a/ui/verifiedContracts/VerifiedContractsListItem.tsx b/ui/verifiedContracts/VerifiedContractsListItem.tsx index 45bf6c4155..69c56dfc97 100644 --- a/ui/verifiedContracts/VerifiedContractsListItem.tsx +++ b/ui/verifiedContracts/VerifiedContractsListItem.tsx @@ -64,7 +64,7 @@ const VerifiedContractsListItem = ({ data, isLoading }: Props) => { Txs count - { data.tx_count ? data.tx_count.toLocaleString() : '0' } + { data.transaction_count ? data.transaction_count.toLocaleString() : '0' } diff --git a/ui/verifiedContracts/VerifiedContractsTableItem.tsx b/ui/verifiedContracts/VerifiedContractsTableItem.tsx index dde4e6c5d6..35d46dd84d 100644 --- a/ui/verifiedContracts/VerifiedContractsTableItem.tsx +++ b/ui/verifiedContracts/VerifiedContractsTableItem.tsx @@ -60,7 +60,7 @@ const VerifiedContractsTableItem = ({ data, isLoading }: Props) => { - { data.tx_count ? data.tx_count.toLocaleString() : '0' } + { data.transaction_count ? data.transaction_count.toLocaleString() : '0' } diff --git a/ui/withdrawals/optimisticL2/OptimisticL2WithdrawalsListItem.tsx b/ui/withdrawals/optimisticL2/OptimisticL2WithdrawalsListItem.tsx index 098d0ef848..39b13bcee5 100644 --- a/ui/withdrawals/optimisticL2/OptimisticL2WithdrawalsListItem.tsx +++ b/ui/withdrawals/optimisticL2/OptimisticL2WithdrawalsListItem.tsx @@ -50,7 +50,7 @@ const OptimisticL2WithdrawalsListItem = ({ item, isLoading }: Props) => { { { item.status } } - { item.l1_tx_hash && ( + { item.l1_transaction_hash && ( <> L1 txn hash { { } - { item.l1_tx_hash ? ( + { item.l1_transaction_hash ? (