Commit 73ce4f50 authored by tom goriunov's avatar tom goriunov Committed by GitHub

Bind to full prop namings in API v2 endpoints (#2381)

Fixes #2374
parent 8da3472a
...@@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js'; ...@@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js';
import type { Block } from 'types/api/block'; import type { Block } from 'types/api/block';
export default function getBlockReward(block: 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 burntFees = BigNumber(block.burnt_fees || 0);
const minerReward = block.rewards?.find(({ type }) => type === 'Miner Reward' || type === 'Validator Reward')?.reward; const minerReward = block.rewards?.find(({ type }) => type === 'Miner Reward' || type === 'Validator Reward')?.reward;
const totalReward = BigNumber(minerReward || 0); const totalReward = BigNumber(minerReward || 0);
......
...@@ -73,7 +73,7 @@ export const token: Address = { ...@@ -73,7 +73,7 @@ export const token: Address = {
token: tokenInfo, token: tokenInfo,
block_number_balance_updated_at: 8201413, block_number_balance_updated_at: 8201413,
coin_balance: '1', coin_balance: '1',
creation_tx_hash: '0xc38cf7377bf72d6436f63c37b01b24d032101f20ec1849286dc703c712f10c98', creation_transaction_hash: '0xc38cf7377bf72d6436f63c37b01b24d032101f20ec1849286dc703c712f10c98',
creator_address_hash: '0x34A9c688512ebdB575e82C50c9803F6ba2916E72', creator_address_hash: '0x34A9c688512ebdB575e82C50c9803F6ba2916E72',
exchange_rate: '0.04311', exchange_rate: '0.04311',
has_decompiled_code: false, has_decompiled_code: false,
...@@ -87,7 +87,7 @@ export const token: Address = { ...@@ -87,7 +87,7 @@ export const token: Address = {
export const eoa: Address = { export const eoa: Address = {
block_number_balance_updated_at: 30811263, block_number_balance_updated_at: 30811263,
coin_balance: '2782650189688719421432220500', coin_balance: '2782650189688719421432220500',
creation_tx_hash: '0xf2aff6501b632604c39978b47d309813d8a1bcca721864bbe86abf59704f195e', creation_transaction_hash: '0xf2aff6501b632604c39978b47d309813d8a1bcca721864bbe86abf59704f195e',
creator_address_hash: '0x803ad3F50b9e1fF68615e8B053A186e1be288943', creator_address_hash: '0x803ad3F50b9e1fF68615e8B053A186e1be288943',
exchange_rate: '0.04311', exchange_rate: '0.04311',
has_decompiled_code: false, has_decompiled_code: false,
...@@ -111,7 +111,7 @@ export const eoa: Address = { ...@@ -111,7 +111,7 @@ export const eoa: Address = {
export const contract: Address = { export const contract: Address = {
block_number_balance_updated_at: 30811263, block_number_balance_updated_at: 30811263,
coin_balance: '27826501896887194214322205', coin_balance: '27826501896887194214322205',
creation_tx_hash: '0xf2aff6501b632604c39978b47d309813d8a1bcca721864bbe86abf59704f195e', creation_transaction_hash: '0xf2aff6501b632604c39978b47d309813d8a1bcca721864bbe86abf59704f195e',
creator_address_hash: '0x803ad3F50b9e1fF68615e8B053A186e1be288943', creator_address_hash: '0x803ad3F50b9e1fF68615e8B053A186e1be288943',
exchange_rate: '0.04311', exchange_rate: '0.04311',
has_decompiled_code: false, has_decompiled_code: false,
...@@ -137,7 +137,7 @@ export const contract: Address = { ...@@ -137,7 +137,7 @@ export const contract: Address = {
export const validator: Address = { export const validator: Address = {
block_number_balance_updated_at: 30811932, block_number_balance_updated_at: 30811932,
coin_balance: '22910462800601256910890', coin_balance: '22910462800601256910890',
creation_tx_hash: null, creation_transaction_hash: null,
creator_address_hash: null, creator_address_hash: null,
exchange_rate: '0.00432018', exchange_rate: '0.00432018',
has_decompiled_code: false, has_decompiled_code: false,
......
...@@ -52,8 +52,8 @@ export const base: Block = { ...@@ -52,8 +52,8 @@ export const base: Block = {
state_root: 'TODO', state_root: 'TODO',
timestamp: '2022-11-11T11:59:35Z', timestamp: '2022-11-11T11:59:35Z',
total_difficulty: '10258276095980170141167591583995189665817672619', total_difficulty: '10258276095980170141167591583995189665817672619',
tx_count: 5, transaction_count: 5,
tx_fees: '26853607500000000', transaction_fees: '26853607500000000',
type: 'block', type: 'block',
uncles_hashes: [], uncles_hashes: [],
}; };
...@@ -89,8 +89,8 @@ export const genesis: Block = { ...@@ -89,8 +89,8 @@ export const genesis: Block = {
state_root: 'TODO', state_root: 'TODO',
timestamp: '2017-12-16T00:13:24.000000Z', timestamp: '2017-12-16T00:13:24.000000Z',
total_difficulty: '131072', total_difficulty: '131072',
tx_count: 0, transaction_count: 0,
tx_fees: '0', transaction_fees: '0',
type: 'block', type: 'block',
uncles_hashes: [], uncles_hashes: [],
}; };
...@@ -111,7 +111,7 @@ export const base2: Block = { ...@@ -111,7 +111,7 @@ export const base2: Block = {
ens_domain_name: null, ens_domain_name: null,
}, },
timestamp: '2022-11-11T11:46:05Z', timestamp: '2022-11-11T11:46:05Z',
tx_count: 253, transaction_count: 253,
gas_target_percentage: 23.6433, gas_target_percentage: 23.6433,
gas_used: '6333342', gas_used: '6333342',
gas_used_percentage: 87.859504, gas_used_percentage: 87.859504,
......
...@@ -18,7 +18,7 @@ export const contract1: VerifiedContract = { ...@@ -18,7 +18,7 @@ export const contract1: VerifiedContract = {
language: 'solidity', language: 'solidity',
market_cap: null, market_cap: null,
optimization_enabled: false, optimization_enabled: false,
tx_count: 7334224, transaction_count: 7334224,
verified_at: '2022-09-16T18:49:29.605179Z', verified_at: '2022-09-16T18:49:29.605179Z',
license_type: 'mit', license_type: 'mit',
}; };
...@@ -42,7 +42,7 @@ export const contract2: VerifiedContract = { ...@@ -42,7 +42,7 @@ export const contract2: VerifiedContract = {
language: 'vyper', language: 'vyper',
market_cap: null, market_cap: null,
optimization_enabled: true, optimization_enabled: true,
tx_count: 440, transaction_count: 440,
verified_at: '2021-09-07T20:01:56.076979Z', verified_at: '2021-09-07T20:01:56.076979Z',
license_type: 'bsd_3_clause', license_type: 'bsd_3_clause',
}; };
......
...@@ -7,17 +7,17 @@ export const mudWorlds: MudWorldsResponse = { ...@@ -7,17 +7,17 @@ export const mudWorlds: MudWorldsResponse = {
{ {
address: withName, address: withName,
coin_balance: '300000000000000000', coin_balance: '300000000000000000',
tx_count: 3938, transaction_count: 3938,
}, },
{ {
address: withoutName, address: withoutName,
coin_balance: '0', coin_balance: '0',
tx_count: 0, transaction_count: 0,
}, },
{ {
address: withoutName, address: withoutName,
coin_balance: '0', coin_balance: '0',
tx_count: 0, transaction_count: 0,
}, },
], ],
next_page_params: { next_page_params: {
......
...@@ -3,31 +3,31 @@ export const data = { ...@@ -3,31 +3,31 @@ export const data = {
{ {
l1_block_number: 8382841, l1_block_number: 8382841,
l1_block_timestamp: '2022-05-27T01:13:48.000000Z', l1_block_timestamp: '2022-05-27T01:13:48.000000Z',
l1_tx_hash: '0xaf3e5f4ef03eac22a622b3434c5dc9f4465aa291900a86bcf0ad9fb14429f05e', l1_transaction_hash: '0xaf3e5f4ef03eac22a622b3434c5dc9f4465aa291900a86bcf0ad9fb14429f05e',
l1_tx_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5', l1_transaction_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5',
l2_tx_gas_limit: '2156928', l2_transaction_gas_limit: '2156928',
l2_tx_hash: '0xb9212c76069b926917816767e4c5a0ef80e519b1ac1c3d3fb5818078f4984667', l2_transaction_hash: '0xb9212c76069b926917816767e4c5a0ef80e519b1ac1c3d3fb5818078f4984667',
}, },
{ {
l1_block_number: 8382841, l1_block_number: 8382841,
l1_block_timestamp: '2022-05-27T01:13:48.000000Z', l1_block_timestamp: '2022-05-27T01:13:48.000000Z',
l1_tx_hash: '0xa280f18cc72f9ad904087eb262c236048e935ad184a85bbd042d544c172c10bf', l1_transaction_hash: '0xa280f18cc72f9ad904087eb262c236048e935ad184a85bbd042d544c172c10bf',
l1_tx_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5', l1_transaction_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5',
l2_tx_gas_limit: '1216064', l2_transaction_gas_limit: '1216064',
l2_tx_hash: '0xaaaeb47a78b5c42d870f8d831a683a7cefe1b031a992170b28b43b82bd08318c', l2_transaction_hash: '0xaaaeb47a78b5c42d870f8d831a683a7cefe1b031a992170b28b43b82bd08318c',
}, },
{ {
l1_block_number: 8382834, l1_block_number: 8382834,
l1_block_timestamp: '2022-06-27T01:11:48.000000Z', l1_block_timestamp: '2022-06-27T01:11:48.000000Z',
l1_tx_hash: '0xfca8cc5440bffa8b975873c02bba3ff3380dd75fbc3260d10179e282cf72d6d4', l1_transaction_hash: '0xfca8cc5440bffa8b975873c02bba3ff3380dd75fbc3260d10179e282cf72d6d4',
l1_tx_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5', l1_transaction_origin: '0x6197d1eef304eb5284a0f6720f79403b4e9bf3a5',
l2_tx_gas_limit: '405824', l2_transaction_gas_limit: '405824',
l2_tx_hash: '0xa0604ebf2614ad708aeefa83f766fb25928dadb5ffb2f45028f5b4f1fa4d9358', l2_transaction_hash: '0xa0604ebf2614ad708aeefa83f766fb25928dadb5ffb2f45028f5b4f1fa4d9358',
}, },
], ],
next_page_params: { next_page_params: {
items_count: 50, items_count: 50,
l1_block_number: 8382363, l1_block_number: 8382363,
tx_hash: '0x2012f0ce966ce6573e7826e9235f227edf5a2f8382b8d646c979f85a77e15c05', transaction_hash: '0x2012f0ce966ce6573e7826e9235f227edf5a2f8382b8d646c979f85a77e15c05',
}, },
}; };
...@@ -3,7 +3,7 @@ export const outputRootsData = { ...@@ -3,7 +3,7 @@ export const outputRootsData = {
{ {
l1_block_number: 8456113, l1_block_number: 8456113,
l1_timestamp: '2022-02-08T12:08:48.000000Z', l1_timestamp: '2022-02-08T12:08:48.000000Z',
l1_tx_hash: '0x19455a53758d5de89070164ff09c40d93f1b4447e721090f03aa150f6159265a', l1_transaction_hash: '0x19455a53758d5de89070164ff09c40d93f1b4447e721090f03aa150f6159265a',
l2_block_number: 5214988, l2_block_number: 5214988,
l2_output_index: 9926, l2_output_index: 9926,
output_root: '0xa7de9bd3986ce5ca8de9f0ab6c7473f4cebe225fb13b57cc5c8472de84a8bab3', output_root: '0xa7de9bd3986ce5ca8de9f0ab6c7473f4cebe225fb13b57cc5c8472de84a8bab3',
...@@ -11,7 +11,7 @@ export const outputRootsData = { ...@@ -11,7 +11,7 @@ export const outputRootsData = {
{ {
l1_block_number: 8456099, l1_block_number: 8456099,
l1_timestamp: '2022-02-08T12:05:24.000000Z', l1_timestamp: '2022-02-08T12:05:24.000000Z',
l1_tx_hash: '0x6aa081e8e33a085e4ec7124fcd8a5f7d36aac0828f176e80d4b70e313a11695b', l1_transaction_hash: '0x6aa081e8e33a085e4ec7124fcd8a5f7d36aac0828f176e80d4b70e313a11695b',
l2_block_number: 5214868, l2_block_number: 5214868,
l2_output_index: 9925, l2_output_index: 9925,
output_root: '0x4ec2822d2f7b4f834d693d88f8a4cf15899882915980a21756d29cfd9f9f3898', output_root: '0x4ec2822d2f7b4f834d693d88f8a4cf15899882915980a21756d29cfd9f9f3898',
...@@ -19,7 +19,7 @@ export const outputRootsData = { ...@@ -19,7 +19,7 @@ export const outputRootsData = {
{ {
l1_block_number: 8456078, l1_block_number: 8456078,
l1_timestamp: '2022-02-08T12:00:48.000000Z', l1_timestamp: '2022-02-08T12:00:48.000000Z',
l1_tx_hash: '0x4238988b0959e41a7b09cef67f58698e05e3bcc29b8d2f60e6c77dc68c91f16e', l1_transaction_hash: '0x4238988b0959e41a7b09cef67f58698e05e3bcc29b8d2f60e6c77dc68c91f16e',
l2_block_number: 5214748, l2_block_number: 5214748,
l2_output_index: 9924, l2_output_index: 9924,
output_root: '0x78b2e13c20f4bbfb4a008127edaaf25aa476f933669edd4856305bf4ab64a92b', output_root: '0x78b2e13c20f4bbfb4a008127edaaf25aa476f933669edd4856305bf4ab64a92b',
......
...@@ -11,33 +11,33 @@ export const txnBatchesData: OptimisticL2TxnBatchesResponse = { ...@@ -11,33 +11,33 @@ export const txnBatchesData: OptimisticL2TxnBatchesResponse = {
batch_data_container: 'in_blob4844', batch_data_container: 'in_blob4844',
internal_id: 260998, internal_id: 260998,
l1_timestamp: '2022-11-10T11:29:11.000000Z', l1_timestamp: '2022-11-10T11:29:11.000000Z',
l1_tx_hashes: [ l1_transaction_hashes: [
'0x9553351f6bd1577f4e782738c087be08697fb11f3b91745138d71ba166d62c3b', '0x9553351f6bd1577f4e782738c087be08697fb11f3b91745138d71ba166d62c3b',
], ],
l2_block_end: 124882074, l2_block_end: 124882074,
l2_block_start: 124881833, l2_block_start: 124881833,
tx_count: 4011, transaction_count: 4011,
}, },
{ {
batch_data_container: 'in_calldata', batch_data_container: 'in_calldata',
internal_id: 260997, internal_id: 260997,
l1_timestamp: '2022-11-03T11:20:59.000000Z', l1_timestamp: '2022-11-03T11:20:59.000000Z',
l1_tx_hashes: [ l1_transaction_hashes: [
'0x80f5fba70d5685bc2b70df836942e892b24afa7bba289a2fac0ca8f4d554cc72', '0x80f5fba70d5685bc2b70df836942e892b24afa7bba289a2fac0ca8f4d554cc72',
], ],
l2_block_end: 124881832, l2_block_end: 124881832,
l2_block_start: 124881613, l2_block_start: 124881613,
tx_count: 4206, transaction_count: 4206,
}, },
{ {
internal_id: 260996, internal_id: 260996,
l1_timestamp: '2024-09-03T11:14:23.000000Z', l1_timestamp: '2024-09-03T11:14:23.000000Z',
l1_tx_hashes: [ l1_transaction_hashes: [
'0x39f4c46cae57bae936acb9159e367794f41f021ed3788adb80ad93830edb5f22', '0x39f4c46cae57bae936acb9159e367794f41f021ed3788adb80ad93830edb5f22',
], ],
l2_block_end: 124881612, l2_block_end: 124881612,
l2_block_start: 124881380, l2_block_start: 124881380,
tx_count: 4490, transaction_count: 4490,
}, },
], ],
next_page_params: { next_page_params: {
...@@ -50,12 +50,12 @@ export const txnBatchTypeCallData: OptimismL2TxnBatchTypeCallData = { ...@@ -50,12 +50,12 @@ export const txnBatchTypeCallData: OptimismL2TxnBatchTypeCallData = {
batch_data_container: 'in_calldata', batch_data_container: 'in_calldata',
internal_id: 309123, internal_id: 309123,
l1_timestamp: '2022-08-10T10:30:24.000000Z', l1_timestamp: '2022-08-10T10:30:24.000000Z',
l1_tx_hashes: [ l1_transaction_hashes: [
'0x478c45f182631ae6f7249d40f31fdac36f41d88caa2e373fba35340a7345ca67', '0x478c45f182631ae6f7249d40f31fdac36f41d88caa2e373fba35340a7345ca67',
], ],
l2_block_end: 10146784, l2_block_end: 10146784,
l2_block_start: 10145379, l2_block_start: 10145379,
tx_count: 1608, transaction_count: 1608,
}; };
export const txnBatchTypeCelestia: OptimismL2TxnBatchTypeCelestia = { export const txnBatchTypeCelestia: OptimismL2TxnBatchTypeCelestia = {
...@@ -71,12 +71,12 @@ export const txnBatchTypeCelestia: OptimismL2TxnBatchTypeCelestia = { ...@@ -71,12 +71,12 @@ export const txnBatchTypeCelestia: OptimismL2TxnBatchTypeCelestia = {
], ],
internal_id: 309667, internal_id: 309667,
l1_timestamp: '2022-08-28T16:51:12.000000Z', l1_timestamp: '2022-08-28T16:51:12.000000Z',
l1_tx_hashes: [ l1_transaction_hashes: [
'0x2bb0b96a8ba0f063a243ac3dee0b2f2d87edb2ba9ef44bfcbc8ed191af1c4c24', '0x2bb0b96a8ba0f063a243ac3dee0b2f2d87edb2ba9ef44bfcbc8ed191af1c4c24',
], ],
l2_block_end: 10935879, l2_block_end: 10935879,
l2_block_start: 10934514, l2_block_start: 10934514,
tx_count: 1574, transaction_count: 1574,
}; };
export const txnBatchTypeEip4844: OptimismL2TxnBatchTypeEip4844 = { export const txnBatchTypeEip4844: OptimismL2TxnBatchTypeEip4844 = {
...@@ -95,10 +95,10 @@ export const txnBatchTypeEip4844: OptimismL2TxnBatchTypeEip4844 = { ...@@ -95,10 +95,10 @@ export const txnBatchTypeEip4844: OptimismL2TxnBatchTypeEip4844 = {
], ],
internal_id: 2538459, internal_id: 2538459,
l1_timestamp: '2022-08-23T03:59:12.000000Z', l1_timestamp: '2022-08-23T03:59:12.000000Z',
l1_tx_hashes: [ l1_transaction_hashes: [
'0x3870f136497e5501dc20d0974daf379c8636c958794d59a9c90d4f8a9f0ed20a', '0x3870f136497e5501dc20d0974daf379c8636c958794d59a9c90d4f8a9f0ed20a',
], ],
l2_block_end: 16291502, l2_block_end: 16291502,
l2_block_start: 16291373, l2_block_start: 16291373,
tx_count: 704, transaction_count: 704,
}; };
...@@ -15,9 +15,9 @@ export const data: OptimisticL2WithdrawalsResponse = { ...@@ -15,9 +15,9 @@ export const data: OptimisticL2WithdrawalsResponse = {
watchlist_names: [], watchlist_names: [],
ens_domain_name: null, ens_domain_name: null,
}, },
l1_tx_hash: '0x1a235bee32ac10cb7efdad98415737484ca66386e491cde9e17d42b136dca684', l1_transaction_hash: '0x1a235bee32ac10cb7efdad98415737484ca66386e491cde9e17d42b136dca684',
l2_timestamp: '2022-02-15T12:50:02.000000Z', l2_timestamp: '2022-02-15T12:50:02.000000Z',
l2_tx_hash: '0x918cd8c5c24c17e06cd02b0379510c4ad56324bf153578fb9caaaa2fe4e7dc35', l2_transaction_hash: '0x918cd8c5c24c17e06cd02b0379510c4ad56324bf153578fb9caaaa2fe4e7dc35',
msg_nonce: 396, msg_nonce: 396,
msg_nonce_version: 1, msg_nonce_version: 1,
status: 'Ready to prove', status: 'Ready to prove',
...@@ -25,9 +25,9 @@ export const data: OptimisticL2WithdrawalsResponse = { ...@@ -25,9 +25,9 @@ export const data: OptimisticL2WithdrawalsResponse = {
{ {
challenge_period_end: null, challenge_period_end: null,
from: null, from: null,
l1_tx_hash: null, l1_transaction_hash: null,
l2_timestamp: null, l2_timestamp: null,
l2_tx_hash: '0x2f117bee32ac10cb7efdad98415737484ca66386e491cde9e17d42b136def593', l2_transaction_hash: '0x2f117bee32ac10cb7efdad98415737484ca66386e491cde9e17d42b136def593',
msg_nonce: 391, msg_nonce: 391,
msg_nonce_version: 1, msg_nonce_version: 1,
status: 'Ready to prove', status: 'Ready to prove',
...@@ -35,9 +35,9 @@ export const data: OptimisticL2WithdrawalsResponse = { ...@@ -35,9 +35,9 @@ export const data: OptimisticL2WithdrawalsResponse = {
{ {
challenge_period_end: '2022-11-11T12:50:02.000000Z', challenge_period_end: '2022-11-11T12:50:02.000000Z',
from: null, from: null,
l1_tx_hash: null, l1_transaction_hash: null,
l2_timestamp: null, l2_timestamp: null,
l2_tx_hash: '0xe14b1f46838176702244a5343629bcecf728ca2d9881d47b4ce46e00c387d7e3', l2_transaction_hash: '0xe14b1f46838176702244a5343629bcecf728ca2d9881d47b4ce46e00c387d7e3',
msg_nonce: 390, msg_nonce: 390,
msg_nonce_version: 1, msg_nonce_version: 1,
status: 'Ready for relay', status: 'Ready for relay',
......
...@@ -114,7 +114,7 @@ export const label1: SearchResultLabel = { ...@@ -114,7 +114,7 @@ export const label1: SearchResultLabel = {
}; };
export const tx1: SearchResultTx = { export const tx1: SearchResultTx = {
tx_hash: '0x349d4025d03c6faec117ee10ac0bce7c7a805dd2cbff7a9f101304d9a8a525dd', transaction_hash: '0x349d4025d03c6faec117ee10ac0bce7c7a805dd2cbff7a9f101304d9a8a525dd',
type: 'transaction' as const, type: 'transaction' as const,
timestamp: '2022-12-11T17:55:20Z', timestamp: '2022-12-11T17:55:20Z',
url: '/tx/0x349d4025d03c6faec117ee10ac0bce7c7a805dd2cbff7a9f101304d9a8a525dd', url: '/tx/0x349d4025d03c6faec117ee10ac0bce7c7a805dd2cbff7a9f101304d9a8a525dd',
......
...@@ -2,148 +2,148 @@ export const base = { ...@@ -2,148 +2,148 @@ export const base = {
chart_data: [ chart_data: [
{ {
date: '2022-11-28', date: '2022-11-28',
tx_count: 26815, transaction_count: 26815,
}, },
{ {
date: '2022-11-27', date: '2022-11-27',
tx_count: 34784, transaction_count: 34784,
}, },
{ {
date: '2022-11-26', date: '2022-11-26',
tx_count: 77527, transaction_count: 77527,
}, },
{ {
date: '2022-11-25', date: '2022-11-25',
tx_count: 39687, transaction_count: 39687,
}, },
{ {
date: '2022-11-24', date: '2022-11-24',
tx_count: 40752, transaction_count: 40752,
}, },
{ {
date: '2022-11-23', date: '2022-11-23',
tx_count: 32569, transaction_count: 32569,
}, },
{ {
date: '2022-11-22', date: '2022-11-22',
tx_count: 34449, transaction_count: 34449,
}, },
{ {
date: '2022-11-21', date: '2022-11-21',
tx_count: 106047, transaction_count: 106047,
}, },
{ {
date: '2022-11-20', date: '2022-11-20',
tx_count: 107713, transaction_count: 107713,
}, },
{ {
date: '2022-11-19', date: '2022-11-19',
tx_count: 96311, transaction_count: 96311,
}, },
{ {
date: '2022-11-18', date: '2022-11-18',
tx_count: 30828, transaction_count: 30828,
}, },
{ {
date: '2022-11-17', date: '2022-11-17',
tx_count: 27422, transaction_count: 27422,
}, },
{ {
date: '2022-11-16', date: '2022-11-16',
tx_count: 75898, transaction_count: 75898,
}, },
{ {
date: '2022-11-15', date: '2022-11-15',
tx_count: 84084, transaction_count: 84084,
}, },
{ {
date: '2022-11-14', date: '2022-11-14',
tx_count: 62266, transaction_count: 62266,
}, },
{ {
date: '2022-11-13', date: '2022-11-13',
tx_count: 22338, transaction_count: 22338,
}, },
{ {
date: '2022-11-12', date: '2022-11-12',
tx_count: 86764, transaction_count: 86764,
}, },
{ {
date: '2022-11-11', date: '2022-11-11',
tx_count: 79493, transaction_count: 79493,
}, },
{ {
date: '2022-11-10', date: '2022-11-10',
tx_count: 92887, transaction_count: 92887,
}, },
{ {
date: '2022-11-09', date: '2022-11-09',
tx_count: 43691, transaction_count: 43691,
}, },
{ {
date: '2022-11-08', date: '2022-11-08',
tx_count: 74197, transaction_count: 74197,
}, },
{ {
date: '2022-11-07', date: '2022-11-07',
tx_count: 58131, transaction_count: 58131,
}, },
{ {
date: '2022-11-06', date: '2022-11-06',
tx_count: 62477, transaction_count: 62477,
}, },
{ {
date: '2022-11-05', date: '2022-11-05',
tx_count: 82897, transaction_count: 82897,
}, },
{ {
date: '2022-11-04', date: '2022-11-04',
tx_count: 91725, transaction_count: 91725,
}, },
{ {
date: '2022-11-03', date: '2022-11-03',
tx_count: 83667, transaction_count: 83667,
}, },
{ {
date: '2022-11-02', date: '2022-11-02',
tx_count: 63743, transaction_count: 63743,
}, },
{ {
date: '2022-11-01', date: '2022-11-01',
tx_count: 152059, transaction_count: 152059,
}, },
{ {
date: '2022-10-31', date: '2022-10-31',
tx_count: 62519, transaction_count: 62519,
}, },
{ {
date: '2022-10-30', date: '2022-10-30',
tx_count: 48569, transaction_count: 48569,
}, },
{ {
date: '2022-10-29', date: '2022-10-29',
tx_count: 36789, transaction_count: 36789,
}, },
], ],
}; };
export const partialData = { export const partialData = {
chart_data: [ chart_data: [
{ date: '2022-11-28', tx_count: 26815 }, { date: '2022-11-28', transaction_count: 26815 },
{ date: '2022-11-27', tx_count: 34784 }, { date: '2022-11-27', transaction_count: 34784 },
{ date: '2022-11-26', tx_count: 77527 }, { date: '2022-11-26', transaction_count: 77527 },
{ date: '2022-11-25', tx_count: null }, { date: '2022-11-25', transaction_count: null },
{ date: '2022-11-24', tx_count: null }, { date: '2022-11-24', transaction_count: null },
{ date: '2022-11-23', tx_count: null }, { date: '2022-11-23', transaction_count: null },
{ date: '2022-11-22', tx_count: 63433 }, { date: '2022-11-22', transaction_count: 63433 },
{ date: '2022-11-21', tx_count: null }, { date: '2022-11-21', transaction_count: null },
], ],
}; };
export const noData = { export const noData = {
chart_data: [ chart_data: [
{ date: '2022-11-25', tx_count: null }, { date: '2022-11-25', transaction_count: null },
{ date: '2022-11-24', tx_count: null }, { date: '2022-11-24', transaction_count: null },
{ date: '2022-11-23', tx_count: null }, { date: '2022-11-23', transaction_count: null },
], ],
}; };
...@@ -39,7 +39,7 @@ export const erc20: TokenTransfer = { ...@@ -39,7 +39,7 @@ export const erc20: TokenTransfer = {
decimals: '18', decimals: '18',
value: '31567373703130350', value: '31567373703130350',
}, },
tx_hash: '0x62d597ebcf3e8d60096dd0363bc2f0f5e2df27ba1dacd696c51aa7c9409f3193', transaction_hash: '0x62d597ebcf3e8d60096dd0363bc2f0f5e2df27ba1dacd696c51aa7c9409f3193',
type: 'token_transfer', type: 'token_transfer',
timestamp: '2022-10-10T14:34:30.000000Z', timestamp: '2022-10-10T14:34:30.000000Z',
block_number: '12345', block_number: '12345',
...@@ -86,7 +86,7 @@ export const erc721: TokenTransfer = { ...@@ -86,7 +86,7 @@ export const erc721: TokenTransfer = {
total: { total: {
token_id: '875879856', token_id: '875879856',
}, },
tx_hash: '0xf13bc7afe5e02b494dd2f22078381d36a4800ef94a0ccc147431db56c301e6cc', transaction_hash: '0xf13bc7afe5e02b494dd2f22078381d36a4800ef94a0ccc147431db56c301e6cc',
type: 'token_transfer', type: 'token_transfer',
timestamp: '2022-10-10T14:34:30.000000Z', timestamp: '2022-10-10T14:34:30.000000Z',
block_number: '12345', block_number: '12345',
...@@ -135,7 +135,7 @@ export const erc1155A: TokenTransfer = { ...@@ -135,7 +135,7 @@ export const erc1155A: TokenTransfer = {
value: '42', value: '42',
decimals: null, decimals: null,
}, },
tx_hash: '0x05d6589367633c032d757a69c5fb16c0e33e3994b0d9d1483f82aeee1f05d746', transaction_hash: '0x05d6589367633c032d757a69c5fb16c0e33e3994b0d9d1483f82aeee1f05d746',
type: 'token_minting', type: 'token_minting',
timestamp: '2022-10-10T14:34:30.000000Z', timestamp: '2022-10-10T14:34:30.000000Z',
block_number: '12345', block_number: '12345',
...@@ -213,7 +213,7 @@ export const erc404A: TokenTransfer = { ...@@ -213,7 +213,7 @@ export const erc404A: TokenTransfer = {
decimals: '18', decimals: '18',
token_id: null, token_id: null,
}, },
tx_hash: '0x05d6589367633c032d757a69c5fb16c0e33e3994b0d9d1483f82aeee1f05d746', transaction_hash: '0x05d6589367633c032d757a69c5fb16c0e33e3994b0d9d1483f82aeee1f05d746',
type: 'token_transfer', type: 'token_transfer',
method: 'swap', method: 'swap',
timestamp: '2022-10-10T14:34:30.000000Z', timestamp: '2022-10-10T14:34:30.000000Z',
......
...@@ -4,14 +4,14 @@ export const txnBatchData: ZkEvmL2TxnBatch = { ...@@ -4,14 +4,14 @@ export const txnBatchData: ZkEvmL2TxnBatch = {
acc_input_hash: '0x4bf88aabe33713b7817266d7860912c58272d808da7397cdc627ca53b296fad3', acc_input_hash: '0x4bf88aabe33713b7817266d7860912c58272d808da7397cdc627ca53b296fad3',
global_exit_root: '0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5', global_exit_root: '0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5',
number: 5, number: 5,
sequence_tx_hash: '0x7ae010e9758441b302db10282807358af460f38c49c618d26a897592f64977f7', sequence_transaction_hash: '0x7ae010e9758441b302db10282807358af460f38c49c618d26a897592f64977f7',
state_root: '0x183b4a38a4a6027947ceb93b323cc94c548c8c05cf605d73ca88351d77cae1a3', state_root: '0x183b4a38a4a6027947ceb93b323cc94c548c8c05cf605d73ca88351d77cae1a3',
status: 'Finalized', status: 'Finalized',
timestamp: '2023-10-20T10:08:18.000000Z', timestamp: '2023-10-20T10:08:18.000000Z',
transactions: [ transactions: [
'0xb5d432c270057c223b973f3b5f00dbad32823d9ef26f3e8d97c819c7c573453a', '0xb5d432c270057c223b973f3b5f00dbad32823d9ef26f3e8d97c819c7c573453a',
], ],
verify_tx_hash: '0x6f7eeaa0eb966e63d127bba6bf8f9046d303c2a1185b542f0b5083f682a0e87f', verify_transaction_hash: '0x6f7eeaa0eb966e63d127bba6bf8f9046d303c2a1185b542f0b5083f682a0e87f',
}; };
export const txnBatchesData: ZkEvmL2TxnBatchesResponse = { export const txnBatchesData: ZkEvmL2TxnBatchesResponse = {
...@@ -19,18 +19,18 @@ export const txnBatchesData: ZkEvmL2TxnBatchesResponse = { ...@@ -19,18 +19,18 @@ export const txnBatchesData: ZkEvmL2TxnBatchesResponse = {
{ {
timestamp: '2023-06-01T14:46:48.000000Z', timestamp: '2023-06-01T14:46:48.000000Z',
status: 'Finalized', status: 'Finalized',
verify_tx_hash: '0x48139721f792d3a68c3781b4cf50e66e8fc7dbb38adff778e09066ea5be9adb8', verify_transaction_hash: '0x48139721f792d3a68c3781b4cf50e66e8fc7dbb38adff778e09066ea5be9adb8',
sequence_tx_hash: '0x6aa081e8e33a085e4ec7124fcd8a5f7d36aac0828f176e80d4b70e313a11695b', sequence_transaction_hash: '0x6aa081e8e33a085e4ec7124fcd8a5f7d36aac0828f176e80d4b70e313a11695b',
number: 5218590, number: 5218590,
tx_count: 9, transaction_count: 9,
}, },
{ {
timestamp: '2023-06-01T14:46:48.000000Z', timestamp: '2023-06-01T14:46:48.000000Z',
status: 'Unfinalized', status: 'Unfinalized',
verify_tx_hash: null, verify_transaction_hash: null,
sequence_tx_hash: null, sequence_transaction_hash: null,
number: 5218591, number: 5218591,
tx_count: 9, transaction_count: 9,
}, },
], ],
next_page_params: { next_page_params: {
......
...@@ -7,9 +7,9 @@ export const base: ZkSyncBatch = { ...@@ -7,9 +7,9 @@ export const base: ZkSyncBatch = {
execute_transaction_hash: '0x110b9a19afbabd5818a996ab2b493a9b23c888d73d95f1ab5272dbae503e103a', execute_transaction_hash: '0x110b9a19afbabd5818a996ab2b493a9b23c888d73d95f1ab5272dbae503e103a',
execute_transaction_timestamp: '2022-03-19T10:29:05.358066Z', execute_transaction_timestamp: '2022-03-19T10:29:05.358066Z',
l1_gas_price: '4173068062', l1_gas_price: '4173068062',
l1_tx_count: 0, l1_transaction_count: 0,
l2_fair_gas_price: '100000000', l2_fair_gas_price: '100000000',
l2_tx_count: 287, l2_transaction_count: 287,
number: 8051, number: 8051,
prove_transaction_hash: '0xb424162ba5afe17c710dceb5fc8d15d7d46a66223454dae8c74aa39f6802625b', prove_transaction_hash: '0xb424162ba5afe17c710dceb5fc8d15d7d46a66223454dae8c74aa39f6802625b',
prove_transaction_timestamp: '2022-03-19T10:29:05.279179Z', prove_transaction_timestamp: '2022-03-19T10:29:05.279179Z',
......
...@@ -10,7 +10,7 @@ export const sealed: ZkSyncBatchesItem = { ...@@ -10,7 +10,7 @@ export const sealed: ZkSyncBatchesItem = {
prove_transaction_timestamp: null, prove_transaction_timestamp: null,
status: 'Sealed on L2', status: 'Sealed on L2',
timestamp: '2022-03-19T12:53:36.000000Z', timestamp: '2022-03-19T12:53:36.000000Z',
tx_count: 738, transaction_count: 738,
}; };
export const sent: ZkSyncBatchesItem = { export const sent: ZkSyncBatchesItem = {
...@@ -23,7 +23,7 @@ export const sent: ZkSyncBatchesItem = { ...@@ -23,7 +23,7 @@ export const sent: ZkSyncBatchesItem = {
prove_transaction_timestamp: null, prove_transaction_timestamp: null,
status: 'Sent to L1', status: 'Sent to L1',
timestamp: '2022-03-19T11:36:45.000000Z', timestamp: '2022-03-19T11:36:45.000000Z',
tx_count: 766, transaction_count: 766,
}; };
export const executed: ZkSyncBatchesItem = { export const executed: ZkSyncBatchesItem = {
...@@ -36,7 +36,7 @@ export const executed: ZkSyncBatchesItem = { ...@@ -36,7 +36,7 @@ export const executed: ZkSyncBatchesItem = {
prove_transaction_timestamp: '2022-03-19T13:28:16.603104Z', prove_transaction_timestamp: '2022-03-19T13:28:16.603104Z',
status: 'Executed on L1', status: 'Executed on L1',
timestamp: '2022-03-19T10:01:52.000000Z', timestamp: '2022-03-19T10:01:52.000000Z',
tx_count: 1071, transaction_count: 1071,
}; };
export const baseResponse: ZkSyncBatchesResponse = { export const baseResponse: ZkSyncBatchesResponse = {
......
...@@ -13,18 +13,18 @@ import { TX_HASH } from './tx'; ...@@ -13,18 +13,18 @@ import { TX_HASH } from './tx';
export const L2_DEPOSIT_ITEM: OptimisticL2DepositsItem = { export const L2_DEPOSIT_ITEM: OptimisticL2DepositsItem = {
l1_block_number: 9045233, l1_block_number: 9045233,
l1_block_timestamp: '2023-05-22T18:00:36.000000Z', l1_block_timestamp: '2023-05-22T18:00:36.000000Z',
l1_tx_hash: TX_HASH, l1_transaction_hash: TX_HASH,
l1_tx_origin: ADDRESS_HASH, l1_transaction_origin: ADDRESS_HASH,
l2_tx_gas_limit: '100000', l2_transaction_gas_limit: '100000',
l2_tx_hash: TX_HASH, l2_transaction_hash: TX_HASH,
}; };
export const L2_WITHDRAWAL_ITEM: OptimisticL2WithdrawalsItem = { export const L2_WITHDRAWAL_ITEM: OptimisticL2WithdrawalsItem = {
challenge_period_end: null, challenge_period_end: null,
from: ADDRESS_PARAMS, from: ADDRESS_PARAMS,
l1_tx_hash: TX_HASH, l1_transaction_hash: TX_HASH,
l2_timestamp: '2023-06-01T13:44:56.000000Z', l2_timestamp: '2023-06-01T13:44:56.000000Z',
l2_tx_hash: TX_HASH, l2_transaction_hash: TX_HASH,
msg_nonce: 2393, msg_nonce: 2393,
msg_nonce_version: 1, msg_nonce_version: 1,
status: 'Ready to prove', status: 'Ready to prove',
...@@ -34,12 +34,12 @@ export const L2_TXN_BATCHES_ITEM: OptimisticL2TxnBatchesItem = { ...@@ -34,12 +34,12 @@ export const L2_TXN_BATCHES_ITEM: OptimisticL2TxnBatchesItem = {
internal_id: 260991, internal_id: 260991,
batch_data_container: 'in_blob4844', batch_data_container: 'in_blob4844',
l1_timestamp: '2023-06-01T14:46:48.000000Z', l1_timestamp: '2023-06-01T14:46:48.000000Z',
l1_tx_hashes: [ l1_transaction_hashes: [
TX_HASH, TX_HASH,
], ],
l2_block_start: 5218590, l2_block_start: 5218590,
l2_block_end: 5218777, l2_block_end: 5218777,
tx_count: 9, transaction_count: 9,
}; };
export const L2_TXN_BATCH: OptimismL2TxnBatch = { export const L2_TXN_BATCH: OptimismL2TxnBatch = {
...@@ -57,7 +57,7 @@ export const L2_TXN_BATCH: OptimismL2TxnBatch = { ...@@ -57,7 +57,7 @@ export const L2_TXN_BATCH: OptimismL2TxnBatch = {
export const L2_OUTPUT_ROOTS_ITEM: OptimisticL2OutputRootsItem = { export const L2_OUTPUT_ROOTS_ITEM: OptimisticL2OutputRootsItem = {
l1_block_number: 9103684, l1_block_number: 9103684,
l1_timestamp: '2023-06-01T15:26:12.000000Z', l1_timestamp: '2023-06-01T15:26:12.000000Z',
l1_tx_hash: TX_HASH, l1_transaction_hash: TX_HASH,
l2_block_number: 10102468, l2_block_number: 10102468,
l2_output_index: 50655, l2_output_index: 50655,
output_root: TX_HASH, output_root: TX_HASH,
......
...@@ -19,7 +19,7 @@ import { TX_HASH } from './tx'; ...@@ -19,7 +19,7 @@ import { TX_HASH } from './tx';
export const ADDRESS_INFO: Address = { export const ADDRESS_INFO: Address = {
block_number_balance_updated_at: 8774377, block_number_balance_updated_at: 8774377,
coin_balance: '810941268802273085757', coin_balance: '810941268802273085757',
creation_tx_hash: null, creation_transaction_hash: null,
creator_address_hash: ADDRESS_HASH, creator_address_hash: ADDRESS_HASH,
exchange_rate: null, exchange_rate: null,
has_decompiled_code: false, has_decompiled_code: false,
...@@ -59,7 +59,7 @@ export const ADDRESS_TABS_COUNTERS: AddressTabsCounters = { ...@@ -59,7 +59,7 @@ export const ADDRESS_TABS_COUNTERS: AddressTabsCounters = {
export const TOP_ADDRESS: AddressesItem = { export const TOP_ADDRESS: AddressesItem = {
coin_balance: '11886682377162664596540805', coin_balance: '11886682377162664596540805',
tx_count: '1835', transaction_count: '1835',
hash: '0x4f7A67464B5976d7547c860109e4432d50AfB38e', hash: '0x4f7A67464B5976d7547c860109e4432d50AfB38e',
implementations: null, implementations: null,
is_contract: false, is_contract: false,
......
...@@ -31,8 +31,8 @@ export const BLOCK: Block = { ...@@ -31,8 +31,8 @@ export const BLOCK: Block = {
state_root: 'TODO', state_root: 'TODO',
timestamp: '2023-05-12T19:29:12.000000Z', timestamp: '2023-05-12T19:29:12.000000Z',
total_difficulty: '10837812015930321201107455268036056402048391639', total_difficulty: '10837812015930321201107455268036056402048391639',
tx_count: 142, transaction_count: 142,
tx_fees: '19241635547777613', transaction_fees: '19241635547777613',
type: 'block', type: 'block',
uncles_hashes: [], uncles_hashes: [],
}; };
......
...@@ -69,7 +69,7 @@ export const VERIFIED_CONTRACT_INFO: VerifiedContract = { ...@@ -69,7 +69,7 @@ export const VERIFIED_CONTRACT_INFO: VerifiedContract = {
language: 'solidity', language: 'solidity',
market_cap: null, market_cap: null,
optimization_enabled: false, optimization_enabled: false,
tx_count: 565058, transaction_count: 565058,
verified_at: '2023-04-10T13:16:33.884921Z', verified_at: '2023-04-10T13:16:33.884921Z',
license_type: 'mit', license_type: 'mit',
}; };
......
...@@ -31,5 +31,5 @@ export const LOG: Log = { ...@@ -31,5 +31,5 @@ export const LOG: Log = {
'0x000000000000000000000000302fd86163cb9ad5533b3952dafa3b633a82bc51', '0x000000000000000000000000302fd86163cb9ad5533b3952dafa3b633a82bc51',
null, null,
], ],
tx_hash: TX_HASH, transaction_hash: TX_HASH,
}; };
...@@ -20,5 +20,5 @@ export const MUD_SCHEMA: MudWorldSchema = { ...@@ -20,5 +20,5 @@ export const MUD_SCHEMA: MudWorldSchema = {
export const MUD_WORLD: MudWorldItem = { export const MUD_WORLD: MudWorldItem = {
address: ADDRESS_PARAMS, address: ADDRESS_PARAMS,
coin_balance: '7072643779453701031672', coin_balance: '7072643779453701031672',
tx_count: 442, transaction_count: 442,
}; };
...@@ -26,5 +26,5 @@ export const SEARCH_RESULT_NEXT_PAGE_PARAMS: SearchResult['next_page_params'] = ...@@ -26,5 +26,5 @@ export const SEARCH_RESULT_NEXT_PAGE_PARAMS: SearchResult['next_page_params'] =
items_count: 50, items_count: 50,
name: 'USDCTest', name: 'USDCTest',
q: 'usd', q: 'usd',
tx_hash: null, transaction_hash: null,
}; };
...@@ -102,7 +102,7 @@ export const TOKEN_TRANSFER_ERC_20: TokenTransfer = { ...@@ -102,7 +102,7 @@ export const TOKEN_TRANSFER_ERC_20: TokenTransfer = {
decimals: '18', decimals: '18',
value: '9851351626684503', value: '9851351626684503',
}, },
tx_hash: TX_HASH, transaction_hash: TX_HASH,
type: 'token_minting', type: 'token_minting',
}; };
......
...@@ -25,20 +25,20 @@ export const ZKEVM_WITHDRAWALS_ITEM: ZkEvmL2WithdrawalsItem = { ...@@ -25,20 +25,20 @@ export const ZKEVM_WITHDRAWALS_ITEM: ZkEvmL2WithdrawalsItem = {
export const ZKEVM_L2_TXN_BATCHES_ITEM: ZkEvmL2TxnBatchesItem = { export const ZKEVM_L2_TXN_BATCHES_ITEM: ZkEvmL2TxnBatchesItem = {
timestamp: '2023-06-01T14:46:48.000000Z', timestamp: '2023-06-01T14:46:48.000000Z',
status: 'Finalized', status: 'Finalized',
verify_tx_hash: TX_HASH, verify_transaction_hash: TX_HASH,
sequence_tx_hash: TX_HASH, sequence_transaction_hash: TX_HASH,
number: 5218590, number: 5218590,
tx_count: 9, transaction_count: 9,
}; };
export const ZKEVM_L2_TXN_BATCH: ZkEvmL2TxnBatch = { export const ZKEVM_L2_TXN_BATCH: ZkEvmL2TxnBatch = {
acc_input_hash: '0xb815fe2832977f1324ad0124a019b938f189f7b470292f40a21284f15774b3b3', acc_input_hash: '0xb815fe2832977f1324ad0124a019b938f189f7b470292f40a21284f15774b3b3',
global_exit_root: '0x0000000000000000000000000000000000000000000000000000000000000000', global_exit_root: '0x0000000000000000000000000000000000000000000000000000000000000000',
number: 1, number: 1,
sequence_tx_hash: '0x57b9b95db5f94f125710bdc8fbb3fabaac10125b44b0cb61dbc69daddf06d0cd', sequence_transaction_hash: '0x57b9b95db5f94f125710bdc8fbb3fabaac10125b44b0cb61dbc69daddf06d0cd',
state_root: '0xb9a589d6b3ae44d3b250a9993caa5e3721568197f56e4743989ecb2285d80ec4', state_root: '0xb9a589d6b3ae44d3b250a9993caa5e3721568197f56e4743989ecb2285d80ec4',
status: 'Finalized', status: 'Finalized',
timestamp: '2023-09-15T06:22:48.000000Z', timestamp: '2023-09-15T06:22:48.000000Z',
transactions: [ '0xff99dd67646b8f3d657cc6f19eb33abc346de2dbaccd03e45e7726cc28e3e186' ], transactions: [ '0xff99dd67646b8f3d657cc6f19eb33abc346de2dbaccd03e45e7726cc28e3e186' ],
verify_tx_hash: '0x093276fa65c67d7b12dd96f4fefafba9d9ad2f1c23c6e53f96583971ce75352d', verify_transaction_hash: '0x093276fa65c67d7b12dd96f4fefafba9d9ad2f1c23c6e53f96583971ce75352d',
}; };
...@@ -12,7 +12,7 @@ export const ZKSYNC_L2_TXN_BATCHES_ITEM: ZkSyncBatchesItem = { ...@@ -12,7 +12,7 @@ export const ZKSYNC_L2_TXN_BATCHES_ITEM: ZkSyncBatchesItem = {
prove_transaction_timestamp: '2022-03-17T20:49:48.772442Z', prove_transaction_timestamp: '2022-03-17T20:49:48.772442Z',
status: 'Executed on L1', status: 'Executed on L1',
timestamp: '2022-03-17T17:00:11.000000Z', timestamp: '2022-03-17T17:00:11.000000Z',
tx_count: 1215, transaction_count: 1215,
}; };
export const ZKSYNC_L2_TXN_BATCH: ZkSyncBatch = { export const ZKSYNC_L2_TXN_BATCH: ZkSyncBatch = {
...@@ -20,8 +20,8 @@ export const ZKSYNC_L2_TXN_BATCH: ZkSyncBatch = { ...@@ -20,8 +20,8 @@ export const ZKSYNC_L2_TXN_BATCH: ZkSyncBatch = {
start_block: 1245209, start_block: 1245209,
end_block: 1245490, end_block: 1245490,
l1_gas_price: '4173068062', l1_gas_price: '4173068062',
l1_tx_count: 0, l1_transaction_count: 0,
l2_fair_gas_price: '100000000', l2_fair_gas_price: '100000000',
l2_tx_count: 287, l2_transaction_count: 287,
root_hash: '0x108c635b94f941fcabcb85500daec2f6be4f0747dff649b1cdd9dd7a7a264792', root_hash: '0x108c635b94f941fcabcb85500daec2f6be4f0747dff649b1cdd9dd7a7a264792',
}; };
...@@ -141,7 +141,7 @@ export type AddressTagErrors = { ...@@ -141,7 +141,7 @@ export type AddressTagErrors = {
} }
export type TransactionTagErrors = { export type TransactionTagErrors = {
tx_hash: Array<string>; transaction_hash: Array<string>;
name: Array<string>; name: Array<string>;
identity_id?: Array<string>; identity_id?: Array<string>;
} }
......
...@@ -12,7 +12,7 @@ export interface Address extends UserTags { ...@@ -12,7 +12,7 @@ export interface Address extends UserTags {
coin_balance: string | null; coin_balance: string | null;
creator_address_hash: string | null; creator_address_hash: string | null;
creator_filecoin_robust_address?: string | null; creator_filecoin_robust_address?: string | null;
creation_tx_hash: string | null; creation_transaction_hash: string | null;
exchange_rate: string | null; exchange_rate: string | null;
ens_domain_name: string | null; ens_domain_name: string | null;
filecoin?: AddressFilecoinParams; filecoin?: AddressFilecoinParams;
......
import type { AddressParam } from './addressParams'; 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 = { export type AddressesResponse = {
items: Array<AddressesItem>; items: Array<AddressesItem>;
......
...@@ -20,7 +20,7 @@ export interface BlockBaseFeeCelo { ...@@ -20,7 +20,7 @@ export interface BlockBaseFeeCelo {
export interface Block { export interface Block {
height: number; height: number;
timestamp: string; timestamp: string;
tx_count: number; transaction_count: number;
miner: AddressParam; miner: AddressParam;
size: number; size: number;
hash: string; hash: string;
...@@ -40,7 +40,7 @@ export interface Block { ...@@ -40,7 +40,7 @@ export interface Block {
gas_used_percentage: number | null; gas_used_percentage: number | null;
burnt_fees_percentage: number | null; burnt_fees_percentage: number | null;
type: BlockType; type: BlockType;
tx_fees: string | null; transaction_fees: string | null;
uncles_hashes: Array<string>; uncles_hashes: Array<string>;
withdrawals_count?: number; withdrawals_count?: number;
// ROOTSTOCK FIELDS // ROOTSTOCK FIELDS
...@@ -56,7 +56,7 @@ export interface Block { ...@@ -56,7 +56,7 @@ export interface Block {
excess_blob_gas?: string; excess_blob_gas?: string;
blob_tx_count?: number; blob_tx_count?: number;
// ZKSYNC FIELDS // ZKSYNC FIELDS
zksync?: Omit<ZkSyncBatchesItem, 'number' | 'tx_count' | 'timestamp'> & { zksync?: Omit<ZkSyncBatchesItem, 'number' | 'transaction_count' | 'timestamp'> & {
'batch_number': number | null; 'batch_number': number | null;
}; };
arbitrum?: ArbitrumBlockData; arbitrum?: ArbitrumBlockData;
...@@ -85,7 +85,7 @@ export interface OptimismBlockData { ...@@ -85,7 +85,7 @@ export interface OptimismBlockData {
internal_id: number; internal_id: number;
blobs: Array<OptimisticL2BlobTypeEip4844> | Array<OptimisticL2BlobTypeCelestia> | null; blobs: Array<OptimisticL2BlobTypeEip4844> | Array<OptimisticL2BlobTypeCelestia> | null;
l1_timestamp: string; l1_timestamp: string;
l1_tx_hashes: Array<string>; l1_transaction_hashes: Array<string>;
} }
export interface BlocksResponse { export interface BlocksResponse {
......
export interface ChartTransactionItem { export interface ChartTransactionItem {
date: string; date: string;
tx_count: number | null; transaction_count: number | null;
} }
export interface ChartMarketItem { export interface ChartMarketItem {
......
...@@ -9,7 +9,7 @@ export interface VerifiedContract { ...@@ -9,7 +9,7 @@ export interface VerifiedContract {
language: 'vyper' | 'yul' | 'solidity'; language: 'vyper' | 'yul' | 'solidity';
has_constructor_args: boolean; has_constructor_args: boolean;
optimization_enabled: boolean; optimization_enabled: boolean;
tx_count: number | null; transaction_count: number | null;
verified_at: string; verified_at: string;
market_cap: string | null; market_cap: string | null;
license_type: SmartContractLicenseType | null; license_type: SmartContractLicenseType | null;
......
...@@ -7,7 +7,7 @@ export interface Log { ...@@ -7,7 +7,7 @@ export interface Log {
data: string; data: string;
index: number; index: number;
decoded: DecodedInput | null; decoded: DecodedInput | null;
tx_hash: string | null; transaction_hash: string | null;
} }
export interface LogsResponseTx { export interface LogsResponseTx {
......
...@@ -11,7 +11,7 @@ export type MudWorldsResponse = { ...@@ -11,7 +11,7 @@ export type MudWorldsResponse = {
export type MudWorldItem = { export type MudWorldItem = {
address: AddressParam; address: AddressParam;
coin_balance: string; coin_balance: string;
tx_count: number | null; transaction_count: number | null;
} }
export type MudWorldSchema = { export type MudWorldSchema = {
......
...@@ -4,11 +4,11 @@ import type { Transaction } from './transaction'; ...@@ -4,11 +4,11 @@ import type { Transaction } from './transaction';
export type OptimisticL2DepositsItem = { export type OptimisticL2DepositsItem = {
l1_block_number: number; l1_block_number: number;
l1_tx_hash: string; l1_transaction_hash: string;
l1_block_timestamp: string; l1_block_timestamp: string;
l1_tx_origin: string; l1_transaction_origin: string;
l2_tx_gas_limit: string; l2_transaction_gas_limit: string;
l2_tx_hash: string; l2_transaction_hash: string;
} }
export type OptimisticL2DepositsResponse = { export type OptimisticL2DepositsResponse = {
...@@ -16,14 +16,14 @@ export type OptimisticL2DepositsResponse = { ...@@ -16,14 +16,14 @@ export type OptimisticL2DepositsResponse = {
next_page_params: { next_page_params: {
items_count: number; items_count: number;
l1_block_number: number; l1_block_number: number;
tx_hash: string; transaction_hash: string;
}; };
} }
export type OptimisticL2OutputRootsItem = { export type OptimisticL2OutputRootsItem = {
l1_block_number: number; l1_block_number: number;
l1_timestamp: string; l1_timestamp: string;
l1_tx_hash: string; l1_transaction_hash: string;
l2_block_number: number; l2_block_number: number;
l2_output_index: number; l2_output_index: number;
output_root: string; output_root: string;
...@@ -43,10 +43,10 @@ export type OptimisticL2TxnBatchesItem = { ...@@ -43,10 +43,10 @@ export type OptimisticL2TxnBatchesItem = {
internal_id: number; internal_id: number;
batch_data_container?: OptimisticL2BatchDataContainer; batch_data_container?: OptimisticL2BatchDataContainer;
l1_timestamp: string; l1_timestamp: string;
l1_tx_hashes: Array<string>; l1_transaction_hashes: Array<string>;
l2_block_start: number; l2_block_start: number;
l2_block_end: number; l2_block_end: number;
tx_count: number; transaction_count: number;
} }
export type OptimisticL2TxnBatchesResponse = { export type OptimisticL2TxnBatchesResponse = {
...@@ -74,10 +74,10 @@ export interface OptimisticL2BlobTypeCelestia { ...@@ -74,10 +74,10 @@ export interface OptimisticL2BlobTypeCelestia {
interface OptimismL2TxnBatchBase { interface OptimismL2TxnBatchBase {
internal_id: number; internal_id: number;
l1_timestamp: string; l1_timestamp: string;
l1_tx_hashes: Array<string>; l1_transaction_hashes: Array<string>;
l2_block_start: number; l2_block_start: number;
l2_block_end: number; l2_block_end: number;
tx_count: number; transaction_count: number;
} }
export interface OptimismL2TxnBatchTypeCallData extends OptimismL2TxnBatchBase { export interface OptimismL2TxnBatchTypeCallData extends OptimismL2TxnBatchBase {
...@@ -116,9 +116,9 @@ export type OptimismL2BatchBlocks = { ...@@ -116,9 +116,9 @@ export type OptimismL2BatchBlocks = {
export type OptimisticL2WithdrawalsItem = { export type OptimisticL2WithdrawalsItem = {
'challenge_period_end': string | null; 'challenge_period_end': string | null;
'from': AddressParam | null; 'from': AddressParam | null;
'l1_tx_hash': string | null; 'l1_transaction_hash': string | null;
'l2_timestamp': string | null; 'l2_timestamp': string | null;
'l2_tx_hash': string; 'l2_transaction_hash': string;
'msg_nonce': number; 'msg_nonce': number;
'msg_nonce_version': number; 'msg_nonce_version': number;
'status': string; 'status': string;
......
...@@ -69,7 +69,7 @@ export interface SearchResultBlock { ...@@ -69,7 +69,7 @@ export interface SearchResultBlock {
export interface SearchResultTx { export interface SearchResultTx {
type: 'transaction'; type: 'transaction';
tx_hash: string; transaction_hash: string;
timestamp: string; timestamp: string;
url?: string; // not used by the frontend, we build the url ourselves url?: string; // not used by the frontend, we build the url ourselves
} }
...@@ -101,7 +101,7 @@ export interface SearchResult { ...@@ -101,7 +101,7 @@ export interface SearchResult {
'items_count': number; 'items_count': number;
'name': string; 'name': string;
'q': string; 'q': string;
'tx_hash': string | null; 'transaction_hash': string | null;
} | null; } | null;
} }
......
...@@ -47,7 +47,7 @@ export type TokenTotal = Erc20TotalPayload | Erc721TotalPayload | Erc1155TotalPa ...@@ -47,7 +47,7 @@ export type TokenTotal = Erc20TotalPayload | Erc721TotalPayload | Erc1155TotalPa
interface TokenTransferBase { interface TokenTransferBase {
type: 'token_transfer' | 'token_burning' | 'token_spawning' | 'token_minting'; type: 'token_transfer' | 'token_burning' | 'token_spawning' | 'token_minting';
tx_hash: string; transaction_hash: string;
from: AddressParam; from: AddressParam;
to: AddressParam; to: AddressParam;
timestamp: string; timestamp: string;
......
...@@ -87,7 +87,7 @@ export type Transaction = { ...@@ -87,7 +87,7 @@ export type Transaction = {
zkevm_status?: typeof ZKEVM_L2_TX_STATUSES[number]; zkevm_status?: typeof ZKEVM_L2_TX_STATUSES[number];
zkevm_sequence_hash?: string; zkevm_sequence_hash?: string;
// zkSync FIELDS // zkSync FIELDS
zksync?: Omit<ZkSyncBatchesItem, 'number' | 'tx_count' | 'timestamp'> & { zksync?: Omit<ZkSyncBatchesItem, 'number' | 'transaction_count' | 'timestamp'> & {
'batch_number': number | null; 'batch_number': number | null;
}; };
// blob tx fields // blob tx fields
......
...@@ -38,11 +38,11 @@ export type ZkEvmL2WithdrawalsResponse = { ...@@ -38,11 +38,11 @@ export type ZkEvmL2WithdrawalsResponse = {
export type ZkEvmL2TxnBatchesItem = { export type ZkEvmL2TxnBatchesItem = {
number: number; number: number;
verify_tx_hash: string | null; verify_transaction_hash: string | null;
sequence_tx_hash: string | null; sequence_transaction_hash: string | null;
status: string; status: string;
timestamp: string | null; timestamp: string | null;
tx_count: number; transaction_count: number;
} }
export type ZkEvmL2TxnBatchesResponse = { export type ZkEvmL2TxnBatchesResponse = {
...@@ -59,12 +59,12 @@ export type ZkEvmL2TxnBatch = { ...@@ -59,12 +59,12 @@ export type ZkEvmL2TxnBatch = {
acc_input_hash: string; acc_input_hash: string;
global_exit_root: string; global_exit_root: string;
number: number; number: number;
sequence_tx_hash: string; sequence_transaction_hash: string;
state_root: string; state_root: string;
status: typeof ZKEVM_L2_TX_BATCH_STATUSES[number]; status: typeof ZKEVM_L2_TX_BATCH_STATUSES[number];
timestamp: string | null; timestamp: string | null;
transactions: Array<string>; transactions: Array<string>;
verify_tx_hash: string; verify_transaction_hash: string;
} }
export type ZkEvmL2TxnBatchTxs = { export type ZkEvmL2TxnBatchTxs = {
......
...@@ -20,7 +20,7 @@ export interface ZkSyncBatchesItem { ...@@ -20,7 +20,7 @@ export interface ZkSyncBatchesItem {
prove_transaction_timestamp: string | null; prove_transaction_timestamp: string | null;
status: ZkSyncBatchStatus; status: ZkSyncBatchStatus;
timestamp: string; timestamp: string;
tx_count: number; transaction_count: number;
} }
export type ZkSyncBatchesResponse = { export type ZkSyncBatchesResponse = {
...@@ -31,13 +31,13 @@ export type ZkSyncBatchesResponse = { ...@@ -31,13 +31,13 @@ export type ZkSyncBatchesResponse = {
} | null; } | null;
} }
export interface ZkSyncBatch extends Omit<ZkSyncBatchesItem, 'tx_count'> { export interface ZkSyncBatch extends Omit<ZkSyncBatchesItem, 'transaction_count'> {
start_block: number; start_block: number;
end_block: number; end_block: number;
l1_gas_price: string; l1_gas_price: string;
l1_tx_count: number; l1_transaction_count: number;
l2_fair_gas_price: string; l2_fair_gas_price: string;
l2_tx_count: number; l2_transaction_count: number;
root_hash: string; root_hash: string;
} }
......
...@@ -58,7 +58,7 @@ const AddressDetails = ({ addressQuery, scrollRef }: Props) => { ...@@ -58,7 +58,7 @@ const AddressDetails = ({ addressQuery, scrollRef }: Props) => {
token: null, token: null,
watchlist_address_id: null, watchlist_address_id: null,
watchlist_names: null, watchlist_names: null,
creation_tx_hash: null, creation_transaction_hash: null,
block_number_balance_updated_at: null, block_number_balance_updated_at: null,
name: null, name: null,
exchange_rate: null, exchange_rate: null,
...@@ -147,7 +147,7 @@ const AddressDetails = ({ addressQuery, scrollRef }: Props) => { ...@@ -147,7 +147,7 @@ const AddressDetails = ({ addressQuery, scrollRef }: Props) => {
<AddressNameInfo data={ data } isLoading={ addressQuery.isPlaceholderData }/> <AddressNameInfo data={ data } isLoading={ addressQuery.isPlaceholderData }/>
{ data.is_contract && data.creation_tx_hash && (creatorAddressHash) && ( { data.is_contract && data.creation_transaction_hash && (creatorAddressHash) && (
<> <>
<DetailsInfoItem.Label <DetailsInfoItem.Label
hint="Transaction and address of creation" hint="Transaction and address of creation"
...@@ -162,7 +162,7 @@ const AddressDetails = ({ addressQuery, scrollRef }: Props) => { ...@@ -162,7 +162,7 @@ const AddressDetails = ({ addressQuery, scrollRef }: Props) => {
noIcon noIcon
/> />
<Text whiteSpace="pre"> at txn </Text> <Text whiteSpace="pre"> at txn </Text>
<TxEntity hash={ data.creation_tx_hash } truncation="constant" noIcon noCopy={ false }/> <TxEntity hash={ data.creation_transaction_hash } truncation="constant" noIcon noCopy={ false }/>
</DetailsInfoItem.Value> </DetailsInfoItem.Value>
</> </>
) } ) }
......
...@@ -40,7 +40,7 @@ const AddressBlocksValidatedListItem = (props: Props) => { ...@@ -40,7 +40,7 @@ const AddressBlocksValidatedListItem = (props: Props) => {
<Flex columnGap={ 2 } w="100%"> <Flex columnGap={ 2 } w="100%">
<Skeleton isLoaded={ !props.isLoading } fontWeight={ 500 } flexShrink={ 0 }>Txn</Skeleton> <Skeleton isLoaded={ !props.isLoading } fontWeight={ 500 } flexShrink={ 0 }>Txn</Skeleton>
<Skeleton isLoaded={ !props.isLoading } display="inline-block" color="Skeleton_secondary"> <Skeleton isLoaded={ !props.isLoading } display="inline-block" color="Skeleton_secondary">
<span>{ props.tx_count }</span> <span>{ props.transaction_count }</span>
</Skeleton> </Skeleton>
</Flex> </Flex>
<Flex columnGap={ 2 } w="100%"> <Flex columnGap={ 2 } w="100%">
......
...@@ -41,7 +41,7 @@ const AddressBlocksValidatedTableItem = (props: Props) => { ...@@ -41,7 +41,7 @@ const AddressBlocksValidatedTableItem = (props: Props) => {
</Td> </Td>
<Td> <Td>
<Skeleton isLoaded={ !props.isLoading } display="inline-block" fontWeight="500"> <Skeleton isLoaded={ !props.isLoading } display="inline-block" fontWeight="500">
<span>{ props.tx_count }</span> <span>{ props.transaction_count }</span>
</Skeleton> </Skeleton>
</Td> </Td>
<Td> <Td>
......
...@@ -72,7 +72,7 @@ export default function useAddressQuery({ hash, isEnabled = true }: Params): Add ...@@ -72,7 +72,7 @@ export default function useAddressQuery({ hash, isEnabled = true }: Params): Add
block_number_balance_updated_at: null, block_number_balance_updated_at: null,
coin_balance: balance.toString(), coin_balance: balance.toString(),
creator_address_hash: null, creator_address_hash: null,
creation_tx_hash: null, creation_transaction_hash: null,
exchange_rate: null, exchange_rate: null,
ens_domain_name: null, ens_domain_name: null,
has_decompiled_code: false, has_decompiled_code: false,
......
...@@ -61,7 +61,7 @@ const AddressesListItem = ({ ...@@ -61,7 +61,7 @@ const AddressesListItem = ({
<HStack spacing={ 3 }> <HStack spacing={ 3 }>
<Skeleton isLoaded={ !isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton> <Skeleton isLoaded={ !isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton>
<Skeleton isLoaded={ !isLoading } fontSize="sm" color="text_secondary"> <Skeleton isLoaded={ !isLoading } fontSize="sm" color="text_secondary">
<span>{ Number(item.tx_count).toLocaleString() }</span> <span>{ Number(item.transaction_count).toLocaleString() }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
</ListItemMobile> </ListItemMobile>
......
...@@ -60,7 +60,7 @@ const AddressesTableItem = ({ ...@@ -60,7 +60,7 @@ const AddressesTableItem = ({
) } ) }
<Td isNumeric> <Td isNumeric>
<Skeleton isLoaded={ !isLoading } display="inline-block" lineHeight="24px"> <Skeleton isLoaded={ !isLoading } display="inline-block" lineHeight="24px">
{ Number(item.tx_count).toLocaleString() } { Number(item.transaction_count).toLocaleString() }
</Skeleton> </Skeleton>
</Td> </Td>
</Tr> </Tr>
......
...@@ -38,7 +38,7 @@ const AddressesLabelSearchListItem = ({ ...@@ -38,7 +38,7 @@ const AddressesLabelSearchListItem = ({
<HStack spacing={ 3 }> <HStack spacing={ 3 }>
<Skeleton isLoaded={ !isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton> <Skeleton isLoaded={ !isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton>
<Skeleton isLoaded={ !isLoading } fontSize="sm" color="text_secondary"> <Skeleton isLoaded={ !isLoading } fontSize="sm" color="text_secondary">
<span>{ Number(item.tx_count).toLocaleString() }</span> <span>{ Number(item.transaction_count).toLocaleString() }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
</ListItemMobile> </ListItemMobile>
......
...@@ -38,7 +38,7 @@ const AddressesLabelSearchTableItem = ({ ...@@ -38,7 +38,7 @@ const AddressesLabelSearchTableItem = ({
</Td> </Td>
<Td isNumeric> <Td isNumeric>
<Skeleton isLoaded={ !isLoading } display="inline-block" lineHeight="24px"> <Skeleton isLoaded={ !isLoading } display="inline-block" lineHeight="24px">
{ Number(item.tx_count).toLocaleString() } { Number(item.transaction_count).toLocaleString() }
</Skeleton> </Skeleton>
</Td> </Td>
</Tr> </Tr>
......
...@@ -122,7 +122,7 @@ const BlockDetails = ({ query }: Props) => { ...@@ -122,7 +122,7 @@ const BlockDetails = ({ query }: Props) => {
const txsNum = (() => { const txsNum = (() => {
const blockTxsNum = ( const blockTxsNum = (
<LinkInternal href={ route({ pathname: '/block/[height_or_hash]', query: { height_or_hash: heightOrHash, tab: 'txs' } }) }> <LinkInternal href={ route({ pathname: '/block/[height_or_hash]', query: { height_or_hash: heightOrHash, tab: 'txs' } }) }>
{ data.tx_count } txn{ data.tx_count === 1 ? '' : 's' } { data.transaction_count } txn{ data.transaction_count === 1 ? '' : 's' }
</LinkInternal> </LinkInternal>
); );
......
...@@ -65,7 +65,7 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery { ...@@ -65,7 +65,7 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery {
return { return {
height: Number(block.number), height: Number(block.number),
timestamp: dayjs.unix(Number(block.timestamp)).format(), timestamp: dayjs.unix(Number(block.timestamp)).format(),
tx_count: block.transactions.length, transaction_count: block.transactions.length,
miner: { ...unknownAddress, hash: block.miner }, miner: { ...unknownAddress, hash: block.miner },
size: Number(block.size), size: Number(block.size),
hash: block.hash, hash: block.hash,
...@@ -84,7 +84,7 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery { ...@@ -84,7 +84,7 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery {
gas_used_percentage: null, gas_used_percentage: null,
burnt_fees_percentage: null, burnt_fees_percentage: null,
type: 'block', // we can't get this type from RPC, so it will always be a regular block 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, uncles_hashes: block.uncles,
withdrawals_count: block.withdrawals?.length, withdrawals_count: block.withdrawals?.length,
}; };
......
...@@ -34,7 +34,7 @@ const isRollup = config.features.rollup.isEnabled; ...@@ -34,7 +34,7 @@ const isRollup = config.features.rollup.isEnabled;
const BlocksListItem = ({ data, isLoading, enableTimeIncrement }: Props) => { const BlocksListItem = ({ data, isLoading, enableTimeIncrement }: Props) => {
const totalReward = getBlockTotalReward(data); const totalReward = getBlockTotalReward(data);
const burntFees = BigNumber(data.burnt_fees || 0); 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); const baseFeeValue = getBaseFeeValue(data.base_fee_per_gas);
return ( return (
...@@ -81,14 +81,14 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement }: Props) => { ...@@ -81,14 +81,14 @@ const BlocksListItem = ({ data, isLoading, enableTimeIncrement }: Props) => {
) } ) }
<Flex columnGap={ 2 }> <Flex columnGap={ 2 }>
<Text fontWeight={ 500 }>Txn</Text> <Text fontWeight={ 500 }>Txn</Text>
{ data.tx_count > 0 ? ( { data.transaction_count > 0 ? (
<Skeleton isLoaded={ !isLoading } display="inline-block"> <Skeleton isLoaded={ !isLoading } display="inline-block">
<LinkInternal href={ route({ pathname: '/block/[height_or_hash]', query: { height_or_hash: String(data.height), tab: 'txs' } }) }> <LinkInternal href={ route({ pathname: '/block/[height_or_hash]', query: { height_or_hash: String(data.height), tab: 'txs' } }) }>
{ data.tx_count } { data.transaction_count }
</LinkInternal> </LinkInternal>
</Skeleton> </Skeleton>
) : ) :
<Text variant="secondary">{ data.tx_count }</Text> <Text variant="secondary">{ data.transaction_count }</Text>
} }
</Flex> </Flex>
<Box> <Box>
......
...@@ -31,7 +31,7 @@ const isRollup = config.features.rollup.isEnabled; ...@@ -31,7 +31,7 @@ const isRollup = config.features.rollup.isEnabled;
const BlocksTableItem = ({ data, isLoading, enableTimeIncrement }: Props) => { const BlocksTableItem = ({ data, isLoading, enableTimeIncrement }: Props) => {
const totalReward = getBlockTotalReward(data); const totalReward = getBlockTotalReward(data);
const burntFees = BigNumber(data.burnt_fees || 0); 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'); const burntFeesIconColor = useColorModeValue('gray.500', 'inherit');
...@@ -89,16 +89,16 @@ const BlocksTableItem = ({ data, isLoading, enableTimeIncrement }: Props) => { ...@@ -89,16 +89,16 @@ const BlocksTableItem = ({ data, isLoading, enableTimeIncrement }: Props) => {
</Td> </Td>
) } ) }
<Td isNumeric fontSize="sm"> <Td isNumeric fontSize="sm">
{ data.tx_count > 0 ? ( { data.transaction_count > 0 ? (
<Skeleton isLoaded={ !isLoading } display="inline-block"> <Skeleton isLoaded={ !isLoading } display="inline-block">
<LinkInternal href={ route({ <LinkInternal href={ route({
pathname: '/block/[height_or_hash]', pathname: '/block/[height_or_hash]',
query: { height_or_hash: String(data.height), tab: 'txs' }, query: { height_or_hash: String(data.height), tab: 'txs' },
}) }> }) }>
{ data.tx_count } { data.transaction_count }
</LinkInternal> </LinkInternal>
</Skeleton> </Skeleton>
) : data.tx_count } ) : data.transaction_count }
</Td> </Td>
<Td fontSize="sm"> <Td fontSize="sm">
<Skeleton isLoaded={ !isLoading } display="inline-block">{ BigNumber(data.gas_used || 0).toFormat() }</Skeleton> <Skeleton isLoaded={ !isLoading } display="inline-block">{ BigNumber(data.gas_used || 0).toFormat() }</Skeleton>
......
...@@ -39,7 +39,7 @@ const OptimisticDepositsListItem = ({ item, isLoading }: Props) => { ...@@ -39,7 +39,7 @@ const OptimisticDepositsListItem = ({ item, isLoading }: Props) => {
<ListItemMobileGrid.Value> <ListItemMobileGrid.Value>
<TxEntity <TxEntity
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.l2_tx_hash } hash={ item.l2_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
truncation="constant_long" truncation="constant_long"
...@@ -59,7 +59,7 @@ const OptimisticDepositsListItem = ({ item, isLoading }: Props) => { ...@@ -59,7 +59,7 @@ const OptimisticDepositsListItem = ({ item, isLoading }: Props) => {
<ListItemMobileGrid.Value> <ListItemMobileGrid.Value>
<TxEntityL1 <TxEntityL1
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.l1_tx_hash } hash={ item.l1_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
truncation="constant_long" truncation="constant_long"
...@@ -69,7 +69,7 @@ const OptimisticDepositsListItem = ({ item, isLoading }: Props) => { ...@@ -69,7 +69,7 @@ const OptimisticDepositsListItem = ({ item, isLoading }: Props) => {
<ListItemMobileGrid.Label isLoading={ isLoading }>L1 txn origin</ListItemMobileGrid.Label> <ListItemMobileGrid.Label isLoading={ isLoading }>L1 txn origin</ListItemMobileGrid.Label>
<ListItemMobileGrid.Value> <ListItemMobileGrid.Value>
<AddressEntityL1 <AddressEntityL1
address={{ hash: item.l1_tx_origin, name: '', is_contract: false, is_verified: false, ens_domain_name: null, implementations: null }} address={{ hash: item.l1_transaction_origin, name: '', is_contract: false, is_verified: false, ens_domain_name: null, implementations: null }}
isLoading={ isLoading } isLoading={ isLoading }
noCopy noCopy
truncation="constant" truncation="constant"
...@@ -78,7 +78,7 @@ const OptimisticDepositsListItem = ({ item, isLoading }: Props) => { ...@@ -78,7 +78,7 @@ const OptimisticDepositsListItem = ({ item, isLoading }: Props) => {
<ListItemMobileGrid.Label isLoading={ isLoading }>Gas limit</ListItemMobileGrid.Label> <ListItemMobileGrid.Label isLoading={ isLoading }>Gas limit</ListItemMobileGrid.Label>
<ListItemMobileGrid.Value> <ListItemMobileGrid.Value>
<Skeleton isLoaded={ !isLoading } display="inline-block">{ BigNumber(item.l2_tx_gas_limit).toFormat() }</Skeleton> <Skeleton isLoaded={ !isLoading } display="inline-block">{ BigNumber(item.l2_transaction_gas_limit).toFormat() }</Skeleton>
</ListItemMobileGrid.Value> </ListItemMobileGrid.Value>
</ListItemMobileGrid.Container> </ListItemMobileGrid.Container>
......
...@@ -28,7 +28,7 @@ const OptimisticDepositsTable = ({ items, top, isLoading }: Props) => { ...@@ -28,7 +28,7 @@ const OptimisticDepositsTable = ({ items, top, isLoading }: Props) => {
</Thead> </Thead>
<Tbody> <Tbody>
{ items.map((item, index) => ( { items.map((item, index) => (
<OptimisticDepositsTableItem key={ item.l2_tx_hash + (isLoading ? index : '') } item={ item } isLoading={ isLoading }/> <OptimisticDepositsTableItem key={ item.l2_transaction_hash + (isLoading ? index : '') } item={ item } isLoading={ isLoading }/>
)) } )) }
</Tbody> </Tbody>
</Table> </Table>
......
...@@ -36,7 +36,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => { ...@@ -36,7 +36,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => {
<Td verticalAlign="middle"> <Td verticalAlign="middle">
<TxEntity <TxEntity
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.l2_tx_hash } hash={ item.l2_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
truncation="constant_long" truncation="constant_long"
...@@ -54,7 +54,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => { ...@@ -54,7 +54,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => {
<Td verticalAlign="middle"> <Td verticalAlign="middle">
<TxEntityL1 <TxEntityL1
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.l1_tx_hash } hash={ item.l1_transaction_hash }
truncation="constant_long" truncation="constant_long"
noIcon noIcon
fontSize="sm" fontSize="sm"
...@@ -63,7 +63,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => { ...@@ -63,7 +63,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => {
</Td> </Td>
<Td verticalAlign="middle"> <Td verticalAlign="middle">
<AddressEntityL1 <AddressEntityL1
address={{ hash: item.l1_tx_origin, name: '', is_contract: false, is_verified: false, ens_domain_name: null, implementations: null }} address={{ hash: item.l1_transaction_origin, name: '', is_contract: false, is_verified: false, ens_domain_name: null, implementations: null }}
isLoading={ isLoading } isLoading={ isLoading }
truncation="constant" truncation="constant"
noCopy noCopy
...@@ -71,7 +71,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => { ...@@ -71,7 +71,7 @@ const OptimisticDepositsTableItem = ({ item, isLoading }: Props) => {
</Td> </Td>
<Td verticalAlign="middle" isNumeric> <Td verticalAlign="middle" isNumeric>
<Skeleton isLoaded={ !isLoading } color="text_secondary" display="inline-block"> <Skeleton isLoaded={ !isLoading } color="text_secondary" display="inline-block">
<span>{ BigNumber(item.l2_tx_gas_limit).toFormat() }</span> <span>{ BigNumber(item.l2_transaction_gas_limit).toFormat() }</span>
</Skeleton> </Skeleton>
</Td> </Td>
</Tr> </Tr>
......
...@@ -67,7 +67,7 @@ const LatestBlocksItem = ({ block, isLoading }: Props) => { ...@@ -67,7 +67,7 @@ const LatestBlocksItem = ({ block, isLoading }: Props) => {
</Flex> </Flex>
<Grid gridGap={ 2 } templateColumns="auto minmax(0, 1fr)" fontSize="sm"> <Grid gridGap={ 2 } templateColumns="auto minmax(0, 1fr)" fontSize="sm">
<Skeleton isLoaded={ !isLoading }>Txn</Skeleton> <Skeleton isLoaded={ !isLoading }>Txn</Skeleton>
<Skeleton isLoaded={ !isLoading } color="text_secondary"><span>{ block.tx_count }</span></Skeleton> <Skeleton isLoaded={ !isLoading } color="text_secondary"><span>{ block.transaction_count }</span></Skeleton>
{ !config.features.rollup.isEnabled && !config.UI.views.block.hiddenFields?.total_reward && ( { !config.features.rollup.isEnabled && !config.UI.views.block.hiddenFields?.total_reward && (
<> <>
......
...@@ -30,7 +30,7 @@ const dailyTxsIndicator: TChainIndicator<'stats_charts_txs'> = { ...@@ -30,7 +30,7 @@ const dailyTxsIndicator: TChainIndicator<'stats_charts_txs'> = {
resourceName: 'stats_charts_txs', resourceName: 'stats_charts_txs',
dataFn: (response) => ([ { dataFn: (response) => ([ {
items: response.chart_data 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) .sort(sortByDateDesc)
.reduceRight(nonNullTailReducer, [] as Array<TimeChartItemRaw>) .reduceRight(nonNullTailReducer, [] as Array<TimeChartItemRaw>)
.map(mapNullToZero), .map(mapNullToZero),
......
...@@ -70,7 +70,7 @@ const LatestZkEvmL2Batches = () => { ...@@ -70,7 +70,7 @@ const LatestZkEvmL2Batches = () => {
<LatestBatchItem <LatestBatchItem
key={ batch.number + (isPlaceholderData ? String(index) : '') } key={ batch.number + (isPlaceholderData ? String(index) : '') }
number={ batch.number } number={ batch.number }
txCount={ batch.tx_count } txCount={ batch.transaction_count }
timestamp={ batch.timestamp } timestamp={ batch.timestamp }
status={ status } status={ status }
isLoading={ isPlaceholderData } isLoading={ isPlaceholderData }
......
...@@ -57,7 +57,7 @@ const LatestOptimisticDeposits = () => { ...@@ -57,7 +57,7 @@ const LatestOptimisticDeposits = () => {
return ( return (
<LatestDeposits <LatestDeposits
items={ data.slice(0, itemsCount).map((item) => ( items={ data.slice(0, itemsCount).map((item) => (
{ 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 } isLoading={ isPlaceholderData }
socketItemsNum={ num } socketItemsNum={ num }
......
...@@ -39,7 +39,7 @@ const MudWorldsListItem = ({ ...@@ -39,7 +39,7 @@ const MudWorldsListItem = ({
<HStack spacing={ 3 }> <HStack spacing={ 3 }>
<Skeleton isLoaded={ !isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton> <Skeleton isLoaded={ !isLoading } fontSize="sm" fontWeight={ 500 }>Txn count</Skeleton>
<Skeleton isLoaded={ !isLoading } fontSize="sm" color="text_secondary"> <Skeleton isLoaded={ !isLoading } fontSize="sm" color="text_secondary">
<span>{ Number(item.tx_count).toLocaleString() }</span> <span>{ Number(item.transaction_count).toLocaleString() }</span>
</Skeleton> </Skeleton>
</HStack> </HStack>
</ListItemMobile> </ListItemMobile>
......
...@@ -26,7 +26,7 @@ const MudWorldsTableItem = ({ item, isLoading }: Props) => { ...@@ -26,7 +26,7 @@ const MudWorldsTableItem = ({ item, isLoading }: Props) => {
</Td> </Td>
<Td isNumeric> <Td isNumeric>
<Skeleton isLoaded={ !isLoading } display="inline-block" lineHeight="24px"> <Skeleton isLoaded={ !isLoading } display="inline-block" lineHeight="24px">
{ Number(item.tx_count).toLocaleString() } { Number(item.transaction_count).toLocaleString() }
</Skeleton> </Skeleton>
</Td> </Td>
</Tr> </Tr>
......
...@@ -52,7 +52,7 @@ const OptimisticL2OutputRootsListItem = ({ item, isLoading }: Props) => { ...@@ -52,7 +52,7 @@ const OptimisticL2OutputRootsListItem = ({ item, isLoading }: Props) => {
<ListItemMobileGrid.Value py="3px"> <ListItemMobileGrid.Value py="3px">
<TxEntityL1 <TxEntityL1
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.l1_tx_hash } hash={ item.l1_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
truncation="constant_long" truncation="constant_long"
......
...@@ -45,7 +45,7 @@ const OptimisticL2OutputRootsTableItem = ({ item, isLoading }: Props) => { ...@@ -45,7 +45,7 @@ const OptimisticL2OutputRootsTableItem = ({ item, isLoading }: Props) => {
<Td verticalAlign="middle" pr={ 12 }> <Td verticalAlign="middle" pr={ 12 }>
<TxEntityL1 <TxEntityL1
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.l1_tx_hash } hash={ item.l1_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
noIcon noIcon
......
...@@ -11,23 +11,23 @@ const addresses: AddressesResponse = { ...@@ -11,23 +11,23 @@ const addresses: AddressesResponse = {
items: [ items: [
{ {
...addressMocks.withName, ...addressMocks.withName,
tx_count: '1', transaction_count: '1',
coin_balance: '12345678901234567890000', coin_balance: '12345678901234567890000',
}, },
{ {
...addressMocks.token, ...addressMocks.token,
tx_count: '109123890123', transaction_count: '109123890123',
coin_balance: '22222345678901234567890000', coin_balance: '22222345678901234567890000',
ens_domain_name: null, ens_domain_name: null,
}, },
{ {
...addressMocks.withoutName, ...addressMocks.withoutName,
tx_count: '11', transaction_count: '11',
coin_balance: '1000000000000000000', coin_balance: '1000000000000000000',
}, },
{ {
...addressMocks.eoa, ...addressMocks.eoa,
tx_count: '420', transaction_count: '420',
coin_balance: '123456', coin_balance: '123456',
}, },
], ],
......
...@@ -11,23 +11,23 @@ const addresses: AddressesMetadataSearchResult = { ...@@ -11,23 +11,23 @@ const addresses: AddressesMetadataSearchResult = {
items: [ items: [
{ {
...addressMocks.withName, ...addressMocks.withName,
tx_count: '1', transaction_count: '1',
coin_balance: '12345678901234567890000', coin_balance: '12345678901234567890000',
}, },
{ {
...addressMocks.token, ...addressMocks.token,
tx_count: '109123890123', transaction_count: '109123890123',
coin_balance: '22222345678901234567890000', coin_balance: '22222345678901234567890000',
ens_domain_name: null, ens_domain_name: null,
}, },
{ {
...addressMocks.withoutName, ...addressMocks.withoutName,
tx_count: '11', transaction_count: '11',
coin_balance: '1000000000000000000', coin_balance: '1000000000000000000',
}, },
{ {
...addressMocks.eoa, ...addressMocks.eoa,
tx_count: '420', transaction_count: '420',
coin_balance: null, coin_balance: null,
}, },
], ],
......
...@@ -24,7 +24,7 @@ const OptimisticL2Deposits = () => { ...@@ -24,7 +24,7 @@ const OptimisticL2Deposits = () => {
next_page_params: { next_page_params: {
items_count: 50, items_count: 50,
l1_block_number: 9045200, l1_block_number: 9045200,
tx_hash: '', transaction_hash: '',
}, },
}, },
), ),
...@@ -42,7 +42,7 @@ const OptimisticL2Deposits = () => { ...@@ -42,7 +42,7 @@ const OptimisticL2Deposits = () => {
<Show below="lg" ssr={ false }> <Show below="lg" ssr={ false }>
{ data.items.map(((item, index) => ( { data.items.map(((item, index) => (
<OptimisticDepositsListItem <OptimisticDepositsListItem
key={ item.l2_tx_hash + (isPlaceholderData ? index : '') } key={ item.l2_transaction_hash + (isPlaceholderData ? index : '') }
isLoading={ isPlaceholderData } isLoading={ isPlaceholderData }
item={ item } item={ item }
/> />
......
...@@ -87,14 +87,14 @@ test('search by block hash +@mobile', async({ render, mockApiResponse }) => { ...@@ -87,14 +87,14 @@ test('search by block hash +@mobile', async({ render, mockApiResponse }) => {
test('search by tx hash +@mobile', async({ render, mockApiResponse }) => { test('search by tx hash +@mobile', async({ render, mockApiResponse }) => {
const hooksConfig = { const hooksConfig = {
router: { router: {
query: { q: searchMock.tx1.tx_hash }, query: { q: searchMock.tx1.transaction_hash },
}, },
}; };
const data = { const data = {
items: [ searchMock.tx1 ], items: [ searchMock.tx1 ],
next_page_params: null, 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(<SearchResults/>, { hooksConfig }); const component = await render(<SearchResults/>, { hooksConfig });
await expect(component.locator('main')).toHaveScreenshot(); await expect(component.locator('main')).toHaveScreenshot();
...@@ -169,7 +169,7 @@ test.describe('with apps', () => { ...@@ -169,7 +169,7 @@ test.describe('with apps', () => {
items_count: 1, items_count: 1,
name: 'foo', name: 'foo',
q: 'o', q: 'o',
tx_hash: null, transaction_hash: null,
}, },
}; };
await mockEnvs([ await mockEnvs([
......
...@@ -37,7 +37,7 @@ const TokenTransfers = () => { ...@@ -37,7 +37,7 @@ const TokenTransfers = () => {
<Show below="lg" ssr={ false }> <Show below="lg" ssr={ false }>
{ tokenTransfersQuery.data?.items.map((item, index) => ( { tokenTransfersQuery.data?.items.map((item, index) => (
<TokenTransfersListItem <TokenTransfersListItem
key={ item.tx_hash + item.log_index + (tokenTransfersQuery.isPlaceholderData ? index : '') } key={ item.transaction_hash + item.log_index + (tokenTransfersQuery.isPlaceholderData ? index : '') }
isLoading={ tokenTransfersQuery.isPlaceholderData } isLoading={ tokenTransfersQuery.isPlaceholderData }
item={ item } item={ item }
/> />
......
...@@ -64,8 +64,8 @@ const TransactionForm: React.FC<Props> = ({ data, onClose, onSuccess, setAlertVi ...@@ -64,8 +64,8 @@ const TransactionForm: React.FC<Props> = ({ data, onClose, onSuccess, setAlertVi
onError: (error: ResourceErrorAccount<TransactionTagErrors>) => { onError: (error: ResourceErrorAccount<TransactionTagErrors>) => {
setPending(false); setPending(false);
const errorMap = error.payload?.errors; const errorMap = error.payload?.errors;
if (errorMap?.tx_hash || errorMap?.name) { if (errorMap?.transaction_hash || errorMap?.name) {
errorMap?.tx_hash && formApi.setError('transaction', { type: 'custom', message: getErrorMessage(errorMap, 'tx_hash') }); errorMap?.transaction_hash && formApi.setError('transaction', { type: 'custom', message: getErrorMessage(errorMap, 'transaction_hash') });
errorMap?.name && formApi.setError('tag', { type: 'custom', message: getErrorMessage(errorMap, 'name') }); errorMap?.name && formApi.setError('tag', { type: 'custom', message: getErrorMessage(errorMap, 'name') });
} else if (errorMap?.identity_id) { } else if (errorMap?.identity_id) {
formApi.setError('transaction', { type: 'custom', message: getErrorMessage(errorMap, 'identity_id') }); formApi.setError('transaction', { type: 'custom', message: getErrorMessage(errorMap, 'identity_id') });
......
...@@ -203,12 +203,12 @@ const SearchResultListItem = ({ data, searchTerm, isLoading, addressFormat }: Pr ...@@ -203,12 +203,12 @@ const SearchResultListItem = ({ data, searchTerm, isLoading, addressFormat }: Pr
<TxEntity.Icon/> <TxEntity.Icon/>
<TxEntity.Link <TxEntity.Link
isLoading={ isLoading } isLoading={ isLoading }
hash={ data.tx_hash } hash={ data.transaction_hash }
onClick={ handleLinkClick } onClick={ handleLinkClick }
> >
<TxEntity.Content <TxEntity.Content
asProp="mark" asProp="mark"
hash={ data.tx_hash } hash={ data.transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
fontWeight={ 700 } fontWeight={ 700 }
......
...@@ -303,12 +303,12 @@ const SearchResultTableItem = ({ data, searchTerm, isLoading, addressFormat }: P ...@@ -303,12 +303,12 @@ const SearchResultTableItem = ({ data, searchTerm, isLoading, addressFormat }: P
<TxEntity.Icon/> <TxEntity.Icon/>
<TxEntity.Link <TxEntity.Link
isLoading={ isLoading } isLoading={ isLoading }
hash={ data.tx_hash } hash={ data.transaction_hash }
onClick={ handleLinkClick } onClick={ handleLinkClick }
> >
<TxEntity.Content <TxEntity.Content
asProp="mark" asProp="mark"
hash={ data.tx_hash } hash={ data.transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
fontWeight={ 700 } fontWeight={ 700 }
......
...@@ -18,7 +18,7 @@ const TokenTransferList = ({ data, baseAddress, showTxInfo, enableTimeIncrement, ...@@ -18,7 +18,7 @@ const TokenTransferList = ({ data, baseAddress, showTxInfo, enableTimeIncrement,
<Box> <Box>
{ data.map((item, index) => ( { data.map((item, index) => (
<TokenTransferListItem <TokenTransferListItem
key={ item.tx_hash + item.block_hash + item.log_index + (isLoading ? index : '') } key={ item.transaction_hash + item.block_hash + item.log_index + (isLoading ? index : '') }
{ ...item } { ...item }
baseAddress={ baseAddress } baseAddress={ baseAddress }
showTxInfo={ showTxInfo } showTxInfo={ showTxInfo }
......
...@@ -26,7 +26,7 @@ type Props = TokenTransfer & { ...@@ -26,7 +26,7 @@ type Props = TokenTransfer & {
const TokenTransferListItem = ({ const TokenTransferListItem = ({
token, token,
total, total,
tx_hash: txHash, transaction_hash: txHash,
from, from,
to, to,
baseAddress, baseAddress,
......
...@@ -57,7 +57,7 @@ const TokenTransferTable = ({ ...@@ -57,7 +57,7 @@ const TokenTransferTable = ({
) } ) }
{ data.map((item, index) => ( { data.map((item, index) => (
<TokenTransferTableItem <TokenTransferTableItem
key={ item.tx_hash + item.block_hash + item.log_index + (isLoading ? index : '') } key={ item.transaction_hash + item.block_hash + item.log_index + (isLoading ? index : '') }
{ ...item } { ...item }
baseAddress={ baseAddress } baseAddress={ baseAddress }
showTxInfo={ showTxInfo } showTxInfo={ showTxInfo }
......
...@@ -25,7 +25,7 @@ type Props = TokenTransfer & { ...@@ -25,7 +25,7 @@ type Props = TokenTransfer & {
const TokenTransferTableItem = ({ const TokenTransferTableItem = ({
token, token,
total, total,
tx_hash: txHash, transaction_hash: txHash,
from, from,
to, to,
baseAddress, baseAddress,
......
...@@ -23,7 +23,7 @@ test('with decoded input data +@mobile +@dark-mode', async({ render }) => { ...@@ -23,7 +23,7 @@ test('with decoded input data +@mobile +@dark-mode', async({ render }) => {
topics={ TOPICS } topics={ TOPICS }
data={ DATA } data={ DATA }
type="transaction" type="transaction"
tx_hash={ null } transaction_hash={ null }
/>, />,
); );
await expect(component).toHaveScreenshot(); await expect(component).toHaveScreenshot();
...@@ -38,7 +38,7 @@ test('without decoded input data +@mobile', async({ render }) => { ...@@ -38,7 +38,7 @@ test('without decoded input data +@mobile', async({ render }) => {
topics={ TOPICS } topics={ TOPICS }
data={ DATA } data={ DATA }
type="transaction" type="transaction"
tx_hash={ null } transaction_hash={ null }
/>, />,
); );
await expect(component).toHaveScreenshot(); await expect(component).toHaveScreenshot();
......
...@@ -23,7 +23,7 @@ const RowHeader = ({ children, isLoading }: { children: React.ReactNode; isLoadi ...@@ -23,7 +23,7 @@ const RowHeader = ({ children, isLoading }: { children: React.ReactNode; isLoadi
</GridItem> </GridItem>
); );
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 borderColor = useColorModeValue('blackAlpha.200', 'whiteAlpha.200');
const dataBgColor = useColorModeValue('blackAlpha.50', 'whiteAlpha.50'); const dataBgColor = useColorModeValue('blackAlpha.50', 'whiteAlpha.50');
......
...@@ -103,9 +103,9 @@ test('search by block hash +@mobile', async({ render, page, mockApiResponse }) = ...@@ -103,9 +103,9 @@ test('search by block hash +@mobile', async({ render, page, mockApiResponse }) =
test('search by tx hash +@mobile', async({ render, page, mockApiResponse }) => { test('search by tx hash +@mobile', async({ render, page, mockApiResponse }) => {
const apiUrl = await mockApiResponse('quick_search', [ const apiUrl = await mockApiResponse('quick_search', [
searchMock.tx1, searchMock.tx1,
], { queryParams: { q: searchMock.tx1.tx_hash } }); ], { queryParams: { q: searchMock.tx1.transaction_hash } });
await render(<SearchBar/>); await render(<SearchBar/>);
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 page.waitForResponse(apiUrl);
await expect(page).toHaveScreenshot({ clip: { x: 0, y: 0, width: 1200, height: 300 } }); 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 ...@@ -140,9 +140,9 @@ test('search by user op hash +@mobile', async({ render, page, mockApiResponse, m
await mockEnvs(ENVS_MAP.userOps); await mockEnvs(ENVS_MAP.userOps);
const apiUrl = await mockApiResponse('quick_search', [ const apiUrl = await mockApiResponse('quick_search', [
searchMock.userOp1, searchMock.userOp1,
], { queryParams: { q: searchMock.tx1.tx_hash } }); ], { queryParams: { q: searchMock.tx1.transaction_hash } });
await render(<SearchBar/>); await render(<SearchBar/>);
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 page.waitForResponse(apiUrl);
await expect(page).toHaveScreenshot({ clip: { x: 0, y: 0, width: 1200, height: 300 } }); await expect(page).toHaveScreenshot({ clip: { x: 0, y: 0, width: 1200, height: 300 } });
......
...@@ -38,7 +38,7 @@ const SearchBarSuggestItem = ({ data, isMobile, searchTerm, onClick, addressForm ...@@ -38,7 +38,7 @@ const SearchBarSuggestItem = ({ data, isMobile, searchTerm, onClick, addressForm
return route({ pathname: '/address/[hash]', query: { hash: data.address } }); return route({ pathname: '/address/[hash]', query: { hash: data.address } });
} }
case 'transaction': { case 'transaction': {
return route({ pathname: '/tx/[hash]', query: { hash: data.tx_hash } }); return route({ pathname: '/tx/[hash]', query: { hash: data.transaction_hash } });
} }
case 'block': { case 'block': {
const isFutureBlock = data.timestamp === undefined; const isFutureBlock = data.timestamp === undefined;
......
...@@ -12,7 +12,7 @@ const SearchBarSuggestTx = ({ data, isMobile }: ItemsProps<SearchResultTx>) => { ...@@ -12,7 +12,7 @@ const SearchBarSuggestTx = ({ data, isMobile }: ItemsProps<SearchResultTx>) => {
const icon = <TxEntity.Icon/>; const icon = <TxEntity.Icon/>;
const hash = ( const hash = (
<chakra.mark overflow="hidden" whiteSpace="nowrap" fontWeight={ 700 }> <chakra.mark overflow="hidden" whiteSpace="nowrap" fontWeight={ 700 }>
<HashStringShortenDynamic hash={ data.tx_hash } isTooltipDisabled/> <HashStringShortenDynamic hash={ data.transaction_hash } isTooltipDisabled/>
</chakra.mark> </chakra.mark>
); );
const date = dayjs(data.timestamp).format('llll'); const date = dayjs(data.timestamp).format('llll');
......
...@@ -16,7 +16,7 @@ const TokenTransferList = ({ data, tokenId, isLoading }: Props) => { ...@@ -16,7 +16,7 @@ const TokenTransferList = ({ data, tokenId, isLoading }: Props) => {
<Box> <Box>
{ data.map((item, index) => ( { data.map((item, index) => (
<TokenTransferListItem <TokenTransferListItem
key={ item.tx_hash + item.block_hash + item.log_index + '_' + index } key={ item.transaction_hash + item.block_hash + item.log_index + '_' + index }
{ ...item } { ...item }
tokenId={ tokenId } tokenId={ tokenId }
isLoading={ isLoading } isLoading={ isLoading }
......
...@@ -18,7 +18,7 @@ type Props = TokenTransfer & { tokenId?: string; isLoading?: boolean }; ...@@ -18,7 +18,7 @@ type Props = TokenTransfer & { tokenId?: string; isLoading?: boolean };
const TokenTransferListItem = ({ const TokenTransferListItem = ({
token, token,
total, total,
tx_hash: txHash, transaction_hash: txHash,
from, from,
to, to,
method, method,
......
...@@ -55,7 +55,7 @@ const TokenTransferTable = ({ data, top, showSocketInfo, socketInfoAlert, socket ...@@ -55,7 +55,7 @@ const TokenTransferTable = ({ data, top, showSocketInfo, socketInfoAlert, socket
) } ) }
{ data.map((item, index) => ( { data.map((item, index) => (
<TokenTransferTableItem <TokenTransferTableItem
key={ item.tx_hash + item.block_hash + item.log_index + '_' + index } key={ item.transaction_hash + item.block_hash + item.log_index + '_' + index }
{ ...item } { ...item }
tokenId={ tokenId } tokenId={ tokenId }
isLoading={ isLoading } isLoading={ isLoading }
......
...@@ -16,7 +16,7 @@ type Props = TokenTransfer & { tokenId?: string; isLoading?: boolean } ...@@ -16,7 +16,7 @@ type Props = TokenTransfer & { tokenId?: string; isLoading?: boolean }
const TokenTransferTableItem = ({ const TokenTransferTableItem = ({
token, token,
total, total,
tx_hash: txHash, transaction_hash: txHash,
from, from,
to, to,
method, method,
......
...@@ -33,7 +33,7 @@ const TokenTransfersListItem = ({ item, isLoading }: Props) => { ...@@ -33,7 +33,7 @@ const TokenTransfersListItem = ({ item, isLoading }: Props) => {
<ListItemMobileGrid.Container> <ListItemMobileGrid.Container>
<ListItemMobileGrid.Label isLoading={ isLoading }>Txn hash</ListItemMobileGrid.Label> <ListItemMobileGrid.Label isLoading={ isLoading }>Txn hash</ListItemMobileGrid.Label>
<ListItemMobileGrid.Value> <ListItemMobileGrid.Value>
<TxEntity hash={ item.tx_hash } isLoading={ isLoading } truncation="constant_long" noIcon/> <TxEntity hash={ item.transaction_hash } isLoading={ isLoading } truncation="constant_long" noIcon/>
</ListItemMobileGrid.Value> </ListItemMobileGrid.Value>
<ListItemMobileGrid.Label isLoading={ isLoading }>Age</ListItemMobileGrid.Label> <ListItemMobileGrid.Label isLoading={ isLoading }>Age</ListItemMobileGrid.Label>
......
...@@ -30,7 +30,7 @@ const TokenTransferTable = ({ items, top, isLoading }: Props) => { ...@@ -30,7 +30,7 @@ const TokenTransferTable = ({ items, top, isLoading }: Props) => {
<Tbody> <Tbody>
{ items?.map((item, index) => ( { items?.map((item, index) => (
<TokenTransferTableItem <TokenTransferTableItem
key={ item.tx_hash + item.log_index + (isLoading ? index : '') } key={ item.transaction_hash + item.log_index + (isLoading ? index : '') }
item={ item } item={ item }
isLoading={ isLoading } isLoading={ isLoading }
/> />
......
...@@ -31,7 +31,7 @@ const TokenTransferTableItem = ({ item, isLoading }: Props) => { ...@@ -31,7 +31,7 @@ const TokenTransferTableItem = ({ item, isLoading }: Props) => {
<Tr> <Tr>
<Td> <Td>
<TxEntity <TxEntity
hash={ item.tx_hash } hash={ item.transaction_hash }
isLoading={ isLoading } isLoading={ isLoading }
fontWeight={ 600 } fontWeight={ 600 }
noIcon noIcon
......
...@@ -104,7 +104,7 @@ const OptimisticL2TxnBatchDetails = ({ query }: Props) => { ...@@ -104,7 +104,7 @@ const OptimisticL2TxnBatchDetails = ({ query }: Props) => {
<DetailsInfoItem.Value> <DetailsInfoItem.Value>
<Skeleton isLoaded={ !isPlaceholderData }> <Skeleton isLoaded={ !isPlaceholderData }>
<LinkInternal href={ route({ pathname: '/batches/[number]', query: { number: data.internal_id.toString(), tab: 'txs' } }) }> <LinkInternal href={ route({ pathname: '/batches/[number]', query: { number: data.internal_id.toString(), tab: 'txs' } }) }>
{ data.tx_count.toLocaleString() } transaction{ data.tx_count === 1 ? '' : 's' } { data.transaction_count.toLocaleString() } transaction{ data.transaction_count === 1 ? '' : 's' }
</LinkInternal> </LinkInternal>
{ ' ' }in this batch { ' ' }in this batch
</Skeleton> </Skeleton>
...@@ -137,7 +137,7 @@ const OptimisticL2TxnBatchDetails = ({ query }: Props) => { ...@@ -137,7 +137,7 @@ const OptimisticL2TxnBatchDetails = ({ query }: Props) => {
<OptimisticL2TxnBatchBlobEip4844 blobs={ data.blobs } isLoading={ isPlaceholderData }/> } <OptimisticL2TxnBatchBlobEip4844 blobs={ data.blobs } isLoading={ isPlaceholderData }/> }
{ data.batch_data_container === 'in_calldata' && ( { data.batch_data_container === 'in_calldata' && (
<OptimisticL2TxnBatchBlobCallData <OptimisticL2TxnBatchBlobCallData
l1TxHashes={ data.l1_tx_hashes } l1TxHashes={ data.l1_transaction_hashes }
l1Timestamp={ data.l1_timestamp } l1Timestamp={ data.l1_timestamp }
isLoading={ isPlaceholderData } isLoading={ isPlaceholderData }
/> />
......
...@@ -52,7 +52,7 @@ const OptimisticL2TxnBatchesListItem = ({ item, isLoading }: Props) => { ...@@ -52,7 +52,7 @@ const OptimisticL2TxnBatchesListItem = ({ item, isLoading }: Props) => {
<ListItemMobileGrid.Label isLoading={ isLoading }>L1 txn count</ListItemMobileGrid.Label> <ListItemMobileGrid.Label isLoading={ isLoading }>L1 txn count</ListItemMobileGrid.Label>
<ListItemMobileGrid.Value> <ListItemMobileGrid.Value>
<Skeleton isLoaded={ !isLoading } minW="40px"> <Skeleton isLoaded={ !isLoading } minW="40px">
{ item.l1_tx_hashes.length } { item.l1_transaction_hashes.length }
</Skeleton> </Skeleton>
</ListItemMobileGrid.Value> </ListItemMobileGrid.Value>
...@@ -75,7 +75,7 @@ const OptimisticL2TxnBatchesListItem = ({ item, isLoading }: Props) => { ...@@ -75,7 +75,7 @@ const OptimisticL2TxnBatchesListItem = ({ item, isLoading }: Props) => {
isLoading={ isLoading } isLoading={ isLoading }
> >
<Skeleton isLoaded={ !isLoading } minW="40px"> <Skeleton isLoaded={ !isLoading } minW="40px">
{ item.tx_count } { item.transaction_count }
</Skeleton> </Skeleton>
</LinkInternal> </LinkInternal>
</ListItemMobileGrid.Value> </ListItemMobileGrid.Value>
......
...@@ -39,7 +39,7 @@ const OptimisticL2TxnBatchesTableItem = ({ item, isLoading }: Props) => { ...@@ -39,7 +39,7 @@ const OptimisticL2TxnBatchesTableItem = ({ item, isLoading }: Props) => {
</Td> </Td>
<Td verticalAlign="middle" isNumeric> <Td verticalAlign="middle" isNumeric>
<Skeleton isLoaded={ !isLoading } minW="40px" display="inline-block"> <Skeleton isLoaded={ !isLoading } minW="40px" display="inline-block">
{ item.l1_tx_hashes.length } { item.l1_transaction_hashes.length }
</Skeleton> </Skeleton>
</Td> </Td>
<Td verticalAlign="middle" isNumeric> <Td verticalAlign="middle" isNumeric>
...@@ -60,7 +60,7 @@ const OptimisticL2TxnBatchesTableItem = ({ item, isLoading }: Props) => { ...@@ -60,7 +60,7 @@ const OptimisticL2TxnBatchesTableItem = ({ item, isLoading }: Props) => {
justifyContent="flex-end" justifyContent="flex-end"
> >
<Skeleton isLoaded={ !isLoading } minW="40px" display="inline-block"> <Skeleton isLoaded={ !isLoading } minW="40px" display="inline-block">
{ item.tx_count } { item.transaction_count }
</Skeleton> </Skeleton>
</LinkInternal> </LinkInternal>
</Td> </Td>
......
...@@ -104,10 +104,10 @@ const ZkEvmL2TxnBatchDetails = ({ query }: Props) => { ...@@ -104,10 +104,10 @@ const ZkEvmL2TxnBatchDetails = ({ query }: Props) => {
Verify tx hash Verify tx hash
</DetailsInfoItem.Label> </DetailsInfoItem.Label>
<DetailsInfoItem.Value> <DetailsInfoItem.Value>
{ data.verify_tx_hash ? ( { data.verify_transaction_hash ? (
<TxEntityL1 <TxEntityL1
isLoading={ isPlaceholderData } isLoading={ isPlaceholderData }
hash={ data.verify_tx_hash } hash={ data.verify_transaction_hash }
maxW="100%" maxW="100%"
/> />
) : <Text>Pending</Text> } ) : <Text>Pending</Text> }
...@@ -162,10 +162,10 @@ const ZkEvmL2TxnBatchDetails = ({ query }: Props) => { ...@@ -162,10 +162,10 @@ const ZkEvmL2TxnBatchDetails = ({ query }: Props) => {
Sequence tx hash Sequence tx hash
</DetailsInfoItem.Label> </DetailsInfoItem.Label>
<DetailsInfoItem.Value> <DetailsInfoItem.Value>
{ data.sequence_tx_hash ? ( { data.sequence_transaction_hash ? (
<TxEntityL1 <TxEntityL1
isLoading={ isPlaceholderData } isLoading={ isPlaceholderData }
hash={ data.sequence_tx_hash } hash={ data.sequence_transaction_hash }
maxW="100%" maxW="100%"
/> />
) : <Text>Pending</Text> } ) : <Text>Pending</Text> }
......
...@@ -59,17 +59,17 @@ const ZkEvmTxnBatchesListItem = ({ item, isLoading }: Props) => { ...@@ -59,17 +59,17 @@ const ZkEvmTxnBatchesListItem = ({ item, isLoading }: Props) => {
fontWeight={ 600 } fontWeight={ 600 }
> >
<Skeleton isLoaded={ !isLoading } minW="40px"> <Skeleton isLoaded={ !isLoading } minW="40px">
{ item.tx_count } { item.transaction_count }
</Skeleton> </Skeleton>
</LinkInternal> </LinkInternal>
</ListItemMobileGrid.Value> </ListItemMobileGrid.Value>
<ListItemMobileGrid.Label isLoading={ isLoading }>Verify tx hash</ListItemMobileGrid.Label> <ListItemMobileGrid.Label isLoading={ isLoading }>Verify tx hash</ListItemMobileGrid.Label>
<ListItemMobileGrid.Value> <ListItemMobileGrid.Value>
{ item.verify_tx_hash ? ( { item.verify_transaction_hash ? (
<TxEntityL1 <TxEntityL1
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.verify_tx_hash } hash={ item.verify_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
truncation="constant_long" truncation="constant_long"
...@@ -79,10 +79,10 @@ const ZkEvmTxnBatchesListItem = ({ item, isLoading }: Props) => { ...@@ -79,10 +79,10 @@ const ZkEvmTxnBatchesListItem = ({ item, isLoading }: Props) => {
<ListItemMobileGrid.Label isLoading={ isLoading }>Sequence hash</ListItemMobileGrid.Label> <ListItemMobileGrid.Label isLoading={ isLoading }>Sequence hash</ListItemMobileGrid.Label>
<ListItemMobileGrid.Value> <ListItemMobileGrid.Value>
{ item.sequence_tx_hash ? ( { item.sequence_transaction_hash ? (
<TxEntityL1 <TxEntityL1
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.sequence_tx_hash } hash={ item.sequence_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
truncation="constant_long" truncation="constant_long"
......
...@@ -50,15 +50,15 @@ const TxnBatchesTableItem = ({ item, isLoading }: Props) => { ...@@ -50,15 +50,15 @@ const TxnBatchesTableItem = ({ item, isLoading }: Props) => {
isLoading={ isLoading } isLoading={ isLoading }
> >
<Skeleton isLoaded={ !isLoading } minW="40px" my={ 1 }> <Skeleton isLoaded={ !isLoading } minW="40px" my={ 1 }>
{ item.tx_count } { item.transaction_count }
</Skeleton> </Skeleton>
</LinkInternal> </LinkInternal>
</Td> </Td>
<Td pr={ 12 } verticalAlign="middle"> <Td pr={ 12 } verticalAlign="middle">
{ item.verify_tx_hash ? ( { item.verify_transaction_hash ? (
<TxEntityL1 <TxEntityL1
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.verify_tx_hash } hash={ item.verify_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
truncation="constant_long" truncation="constant_long"
...@@ -67,10 +67,10 @@ const TxnBatchesTableItem = ({ item, isLoading }: Props) => { ...@@ -67,10 +67,10 @@ const TxnBatchesTableItem = ({ item, isLoading }: Props) => {
) : <Text>Pending</Text> } ) : <Text>Pending</Text> }
</Td> </Td>
<Td pr={ 12 } verticalAlign="middle"> <Td pr={ 12 } verticalAlign="middle">
{ item.sequence_tx_hash ? ( { item.sequence_transaction_hash ? (
<TxEntityL1 <TxEntityL1
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.sequence_tx_hash } hash={ item.sequence_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
truncation="constant_long" truncation="constant_long"
......
...@@ -67,7 +67,7 @@ const ZkSyncL2TxnBatchDetails = ({ query }: Props) => { ...@@ -67,7 +67,7 @@ const ZkSyncL2TxnBatchDetails = ({ query }: Props) => {
return null; return null;
} }
const txNum = data.l2_tx_count + data.l1_tx_count; const txNum = data.l2_transaction_count + data.l1_transaction_count;
return ( return (
<Grid <Grid
......
...@@ -59,7 +59,7 @@ const ZkSyncTxnBatchesListItem = ({ item, isLoading }: Props) => { ...@@ -59,7 +59,7 @@ const ZkSyncTxnBatchesListItem = ({ item, isLoading }: Props) => {
fontWeight={ 600 } fontWeight={ 600 }
> >
<Skeleton isLoaded={ !isLoading } minW="40px"> <Skeleton isLoaded={ !isLoading } minW="40px">
{ item.tx_count } { item.transaction_count }
</Skeleton> </Skeleton>
</LinkInternal> </LinkInternal>
</ListItemMobileGrid.Value> </ListItemMobileGrid.Value>
......
...@@ -50,7 +50,7 @@ const ZkSyncTxnBatchesTableItem = ({ item, isLoading }: Props) => { ...@@ -50,7 +50,7 @@ const ZkSyncTxnBatchesTableItem = ({ item, isLoading }: Props) => {
isLoading={ isLoading } isLoading={ isLoading }
> >
<Skeleton isLoaded={ !isLoading } minW="40px" my={ 1 }> <Skeleton isLoaded={ !isLoading } minW="40px" my={ 1 }>
{ item.tx_count } { item.transaction_count }
</Skeleton> </Skeleton>
</LinkInternal> </LinkInternal>
</Td> </Td>
......
...@@ -64,7 +64,7 @@ const VerifiedContractsListItem = ({ data, isLoading }: Props) => { ...@@ -64,7 +64,7 @@ const VerifiedContractsListItem = ({ data, isLoading }: Props) => {
<Flex columnGap={ 3 }> <Flex columnGap={ 3 }>
<Skeleton isLoaded={ !isLoading } fontWeight={ 500 }>Txs count</Skeleton> <Skeleton isLoaded={ !isLoading } fontWeight={ 500 }>Txs count</Skeleton>
<Skeleton isLoaded={ !isLoading } color="text_secondary"> <Skeleton isLoaded={ !isLoading } color="text_secondary">
<span>{ data.tx_count ? data.tx_count.toLocaleString() : '0' }</span> <span>{ data.transaction_count ? data.transaction_count.toLocaleString() : '0' }</span>
</Skeleton> </Skeleton>
</Flex> </Flex>
<Flex columnGap={ 3 }> <Flex columnGap={ 3 }>
......
...@@ -60,7 +60,7 @@ const VerifiedContractsTableItem = ({ data, isLoading }: Props) => { ...@@ -60,7 +60,7 @@ const VerifiedContractsTableItem = ({ data, isLoading }: Props) => {
</Td> </Td>
<Td isNumeric> <Td isNumeric>
<Skeleton isLoaded={ !isLoading } display="inline-block" my={ 1 }> <Skeleton isLoaded={ !isLoading } display="inline-block" my={ 1 }>
{ data.tx_count ? data.tx_count.toLocaleString() : '0' } { data.transaction_count ? data.transaction_count.toLocaleString() : '0' }
</Skeleton> </Skeleton>
</Td> </Td>
<Td> <Td>
......
...@@ -50,7 +50,7 @@ const OptimisticL2WithdrawalsListItem = ({ item, isLoading }: Props) => { ...@@ -50,7 +50,7 @@ const OptimisticL2WithdrawalsListItem = ({ item, isLoading }: Props) => {
<ListItemMobileGrid.Value> <ListItemMobileGrid.Value>
<TxEntity <TxEntity
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.l2_tx_hash } hash={ item.l2_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
truncation="constant_long" truncation="constant_long"
...@@ -77,13 +77,13 @@ const OptimisticL2WithdrawalsListItem = ({ item, isLoading }: Props) => { ...@@ -77,13 +77,13 @@ const OptimisticL2WithdrawalsListItem = ({ item, isLoading }: Props) => {
<Skeleton isLoaded={ !isLoading } display="inline-block">{ item.status }</Skeleton> } <Skeleton isLoaded={ !isLoading } display="inline-block">{ item.status }</Skeleton> }
</ListItemMobileGrid.Value> </ListItemMobileGrid.Value>
{ item.l1_tx_hash && ( { item.l1_transaction_hash && (
<> <>
<ListItemMobileGrid.Label isLoading={ isLoading }>L1 txn hash</ListItemMobileGrid.Label> <ListItemMobileGrid.Label isLoading={ isLoading }>L1 txn hash</ListItemMobileGrid.Label>
<ListItemMobileGrid.Value> <ListItemMobileGrid.Value>
<TxEntityL1 <TxEntityL1
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.l1_tx_hash } hash={ item.l1_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
truncation="constant_long" truncation="constant_long"
......
...@@ -39,7 +39,7 @@ const OptimisticL2WithdrawalsTableItem = ({ item, isLoading }: Props) => { ...@@ -39,7 +39,7 @@ const OptimisticL2WithdrawalsTableItem = ({ item, isLoading }: Props) => {
<Td verticalAlign="middle"> <Td verticalAlign="middle">
<TxEntity <TxEntity
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.l2_tx_hash } hash={ item.l2_transaction_hash }
fontSize="sm" fontSize="sm"
lineHeight={ 5 } lineHeight={ 5 }
truncation="constant_long" truncation="constant_long"
...@@ -62,10 +62,10 @@ const OptimisticL2WithdrawalsTableItem = ({ item, isLoading }: Props) => { ...@@ -62,10 +62,10 @@ const OptimisticL2WithdrawalsTableItem = ({ item, isLoading }: Props) => {
} }
</Td> </Td>
<Td verticalAlign="middle"> <Td verticalAlign="middle">
{ item.l1_tx_hash ? ( { item.l1_transaction_hash ? (
<TxEntityL1 <TxEntityL1
isLoading={ isLoading } isLoading={ isLoading }
hash={ item.l1_tx_hash } hash={ item.l1_transaction_hash }
truncation="constant_long" truncation="constant_long"
noIcon noIcon
fontSize="sm" fontSize="sm"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment