Merge branch 'main' of github.com:blockscout/frontend into marketplace-admin-api

mocks/l2txnBatches/txnBatches.ts

 export const txnBatchesData = {
   items: [
     {
-      epoch_number: 8547349,
       l1_tx_hashes: [
         '0x5bc94d02b65743dfaa9e10a2d6e175aff2a05cce2128c8eaf848bd84ab9325c5',
         '0x92a51bc623111dbb91f243e3452e60fab6f090710357f9d9b75ac8a0f67dfd9d',
@@ -11,7 +10,6 @@ export const txnBatchesData = {
       tx_count: 0,
     },
     {
-      epoch_number: 8547348,
       l1_tx_hashes: [
         '0xc45f846ee28ce9ba116ce2d378d3dd00b55d324b833b3ecd4241c919c572c4aa',
       ],
@@ -20,7 +18,6 @@ export const txnBatchesData = {
       tx_count: 0,
     },
     {
-      epoch_number: 8547348,
       l1_tx_hashes: [
         '0x48139721f792d3a68c3781b4cf50e66e8fc7dbb38adff778e09066ea5be9adb8',
       ],

stubs/L2.ts

@@ -29,7 +29,6 @@ export const L2_WITHDRAWAL_ITEM: OptimisticL2WithdrawalsItem = {
 };
 
 export const L2_TXN_BATCHES_ITEM: OptimisticL2TxnBatchesItem = {
-  epoch_number: 9103513,
   l1_timestamp: '2023-06-01T14:46:48.000000Z',
   l1_tx_hashes: [
     TX_HASH,

types/api/optimisticL2.ts

@@ -36,7 +36,6 @@ export type OptimisticL2OutputRootsResponse = {
 }
 
 export type OptimisticL2TxnBatchesItem = {
-  epoch_number: number;
   l1_tx_hashes: Array<string>;
   l1_timestamp: string;
   l2_block_number: number;

ui/address/utils/useAddressCountersQuery.ts

@@ -39,6 +39,10 @@ export default function useAddressQuery({ hash, addressQuery }: Params): Address
   const rpcQuery = useQuery<RpcResponseType, unknown, AddressCounters | null>({
     queryKey: [ 'RPC', 'address_counters', { hash } ],
     queryFn: async() => {
+      if (!publicClient) {
+        throw new Error('No public RPC client');
+      }
+
       const txCount = publicClient.getTransactionCount({ address: hash as `0x${ string }` }).catch(() => null);
 
       return Promise.all([
@@ -60,7 +64,7 @@ export default function useAddressQuery({ hash, addressQuery }: Params): Address
     refetchOnMount: false,
   });
 
-  const isRpcQuery = Boolean((addressQuery.isDegradedData || apiQuery.isError) && rpcQuery.data);
+  const isRpcQuery = Boolean((addressQuery.isDegradedData || apiQuery.isError) && rpcQuery.data && publicClient);
   const query = isRpcQuery ? rpcQuery as UseQueryResult<AddressCounters, ResourceError<{ status: number }>> : apiQuery;
 
   return {

ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesListItem.tsx

@@ -7,7 +7,6 @@ import { route } from 'nextjs-routes';
 
 import config from 'configs/app';
 import dayjs from 'lib/date/dayjs';
-import BlockEntityL1 from 'ui/shared/entities/block/BlockEntityL1';
 import BlockEntityL2 from 'ui/shared/entities/block/BlockEntityL2';
 import TxEntityL1 from 'ui/shared/entities/tx/TxEntityL1';
 import LinkInternal from 'ui/shared/LinkInternal';
@@ -50,18 +49,6 @@ const OptimisticL2TxnBatchesListItem = ({ item, isLoading }: Props) => {
         </LinkInternal>
       </ListItemMobileGrid.Value>
 
-      <ListItemMobileGrid.Label isLoading={ isLoading }>Epoch number</ListItemMobileGrid.Label>
-      <ListItemMobileGrid.Value>
-        <BlockEntityL1
-          isLoading={ isLoading }
-          number={ item.epoch_number }
-          noIcon
-          fontSize="sm"
-          lineHeight={ 5 }
-          fontWeight={ 600 }
-        />
-      </ListItemMobileGrid.Value>
-
       <ListItemMobileGrid.Label isLoading={ isLoading }>L1 txn hash</ListItemMobileGrid.Label>
       <ListItemMobileGrid.Value py="3px">
         <VStack spacing={ 3 } w="100%" overflow="hidden" alignItems="flex-start">

ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesTable.tsx

@@ -20,7 +20,6 @@ const OptimisticL2TxnBatchesTable = ({ items, top, isLoading }: Props) => {
         <Tr>
           <Th width="170px">L2 block #</Th>
           <Th width="170px">L2 block txn count</Th>
-          <Th width="160px">Epoch number</Th>
           <Th width="100%">L1 txn hash</Th>
           <Th width="150px">Age</Th>
         </Tr>

ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesTableItem.tsx

@@ -7,7 +7,6 @@ import { route } from 'nextjs-routes';
 
 import config from 'configs/app';
 import dayjs from 'lib/date/dayjs';
-import BlockEntityL1 from 'ui/shared/entities/block/BlockEntityL1';
 import BlockEntityL2 from 'ui/shared/entities/block/BlockEntityL2';
 import TxEntityL1 from 'ui/shared/entities/tx/TxEntityL1';
 import LinkInternal from 'ui/shared/LinkInternal';
@@ -45,17 +44,6 @@ const OptimisticL2TxnBatchesTableItem = ({ item, isLoading }: Props) => {
           </Skeleton>
         </LinkInternal>
       </Td>
-      <Td>
-        <BlockEntityL1
-          isLoading={ isLoading }
-          number={ item.epoch_number }
-          fontSize="sm"
-          lineHeight={ 5 }
-          fontWeight={ 600 }
-          py="2px"
-          noIcon
-        />
-      </Td>
       <Td pr={ 12 }>
         <VStack spacing={ 3 } alignItems="flex-start">
           { item.l1_tx_hashes.map(hash => (