Noves integration

deploy/values/review/values.yaml.gotmpl

@@ -78,6 +78,8 @@ frontend:
     NEXT_PUBLIC_HAS_USER_OPS: true
     NEXT_PUBLIC_CONTRACT_CODE_IDES: "[{'title':'Remix IDE','url':'https://remix.blockscout.com/?address={hash}&blockscout=eth-goerli.blockscout.com','icon_url':'https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/ide-icons/remix.png'}]"
     NEXT_PUBLIC_TRANSACTION_INTERPRETATION_PROVIDER: noves
+    NEXT_PUBLIC_SWAP_BUTTON_URL: uniswap
+    NEXT_PUBLIC_HAS_CONTRACT_AUDIT_REPORTS: true
   envFromSecret:
     NEXT_PUBLIC_SENTRY_DSN: ref+vault://deployment-values/blockscout/dev/review?token_env=VAULT_TOKEN&address=https://vault.k8s.blockscout.com#/NEXT_PUBLIC_SENTRY_DSN
     SENTRY_CSP_REPORT_URI: ref+vault://deployment-values/blockscout/dev/review?token_env=VAULT_TOKEN&address=https://vault.k8s.blockscout.com#/SENTRY_CSP_REPORT_URI
@@ -88,4 +90,3 @@ frontend:
     FAVICON_GENERATOR_API_KEY: ref+vault://deployment-values/blockscout/common?token_env=VAULT_TOKEN&address=https://vault.k8s.blockscout.com#/NEXT_PUBLIC_FAVICON_GENERATOR_API_KEY
     NEXT_PUBLIC_GROWTH_BOOK_CLIENT_KEY: ref+vault://deployment-values/blockscout/dev/review?token_env=VAULT_TOKEN&address=https://vault.k8s.blockscout.com#/NEXT_PUBLIC_GROWTH_BOOK_CLIENT_KEY
     NEXT_PUBLIC_MIXPANEL_PROJECT_TOKEN: ref+vault://deployment-values/blockscout/common?token_env=VAULT_TOKEN&address=https://vault.k8s.blockscout.com#/NEXT_PUBLIC_MIXPANEL_PROJECT_TOKEN
-

lib/api/resources.ts

@@ -56,6 +56,13 @@ import type { IndexingStatus } from 'types/api/indexingStatus';
 import type { InternalTransactionsResponse } from 'types/api/internalTransaction';
 import type { LogsResponseTx, LogsResponseAddress } from 'types/api/log';
 import type { NovesAccountHistoryResponse, NovesDescribeTxsResponse, NovesResponseData } from 'types/api/noves';
+import type {
+  OptimisticL2DepositsResponse,
+  OptimisticL2DepositsItem,
+  OptimisticL2OutputRootsResponse,
+  OptimisticL2TxnBatchesResponse,
+  OptimisticL2WithdrawalsResponse,
+} from 'types/api/optimisticL2';
 import type { RawTracesResponse } from 'types/api/rawTrace';
 import type { SearchRedirectResult, SearchResult, SearchResultFilters, SearchResultItem } from 'types/api/search';
 import type { ShibariumWithdrawalsResponse, ShibariumDepositsResponse } from 'types/api/shibarium';
@@ -93,17 +100,14 @@ import type { ArrayElement } from 'types/utils';
 
 import config from 'configs/app';
 
-export interface QueryParamArray {
-  key: string;
-  type: 'array';
-}
+const marketplaceFeature = getFeaturePayload(config.features.marketplace);
+const marketplaceApi = marketplaceFeature && 'api' in marketplaceFeature ? marketplaceFeature.api : undefined;
 
 export interface ApiResource {
   path: ResourcePath;
   endpoint?: string;
   basePath?: string;
   pathParams?: Array<string>;
-  queryParams?: Array<string | QueryParamArray>;
   needAuth?: boolean; // for external APIs which require authentication
   headers?: RequestInit['headers'];
 }
@@ -617,6 +621,25 @@ export const RESOURCES = {
     filterFields: [],
   },
 
+  // SHIBARIUM L2
+  shibarium_deposits: {
+    path: '/api/v2/shibarium/deposits',
+    filterFields: [],
+  },
+
+  shibarium_deposits_count: {
+    path: '/api/v2/shibarium/deposits/count',
+  },
+
+  shibarium_withdrawals: {
+    path: '/api/v2/shibarium/withdrawals',
+    filterFields: [],
+  },
+
+  shibarium_withdrawals_count: {
+    path: '/api/v2/shibarium/withdrawals/count',
+  },
+
   // NOVES-FI
   noves_transaction: {
     path: '/api/v2/proxy/noves-fi/transactions/:hash',
@@ -630,6 +653,7 @@ export const RESOURCES = {
   noves_describe_txs: {
     path: '/api/v2/proxy/noves-fi/transaction-descriptions',
   },
+
   // USER OPS
   user_ops: {
     path: '/api/v2/proxy/account-abstraction/operations',
@@ -728,7 +752,7 @@ export type PaginatedResources = 'blocks' | 'block_txs' |
 'zkevm_l2_txn_batches' | 'zkevm_l2_txn_batch_txs' |
 'withdrawals' | 'address_withdrawals' | 'block_withdrawals' |
 'watchlist' | 'private_tags_address' | 'private_tags_tx' |
-'domains_lookup' | 'addresses_lookup' | 'user_ops' | 'noves_address_history';
+'domains_lookup' | 'addresses_lookup' | 'user_ops' | 'validators' | 'noves_address_history';
 
 export type PaginatedResponse<Q extends PaginatedResources> = ResourcePayload<Q>;
 
@@ -830,9 +854,6 @@ Q extends 'zkevm_l2_txn_batches_count' ? number :
 Q extends 'zkevm_l2_txn_batch' ? ZkEvmL2TxnBatch :
 Q extends 'zkevm_l2_txn_batch_txs' ? ZkEvmL2TxnBatchTxs :
 Q extends 'config_backend_version' ? BackendVersionConfig :
-Q extends 'noves_transaction' ? NovesResponseData :
-Q extends 'noves_address_history' ? NovesAccountHistoryResponse :
-Q extends 'noves_describe_txs' ? NovesDescribeTxsResponse :
 Q extends 'addresses_lookup' ? EnsAddressLookupResponse :
 Q extends 'domain_info' ? EnsDomainDetailed :
 Q extends 'domain_events' ? EnsDomainEventsResponse :
@@ -856,6 +877,9 @@ Q extends 'shibarium_deposits' ? ShibariumDepositsResponse :
 Q extends 'shibarium_withdrawals_count' ? number :
 Q extends 'shibarium_deposits_count' ? number :
 Q extends 'contract_security_audits' ? SmartContractSecurityAudits :
+Q extends 'noves_transaction' ? NovesResponseData :
+Q extends 'noves_address_history' ? NovesAccountHistoryResponse :
+Q extends 'noves_describe_txs' ? NovesDescribeTxsResponse :
 never;
 /* eslint-enable @typescript-eslint/indent */
 

nextjs/nextjs-routes.d.ts

@@ -39,6 +39,7 @@ declare module "nextjs-routes" {
     | StaticRoute<"/login">
     | StaticRoute<"/name-domains">
     | DynamicRoute<"/name-domains/[name]", { "name": string }>
+    | StaticRoute<"/name-domains">
     | DynamicRoute<"/op/[hash]", { "hash": string }>
     | StaticRoute<"/ops">
     | StaticRoute<"/output-roots">

types/api/noves.ts

@@ -82,7 +82,7 @@ export interface NovesAccountHistoryResponse {
   pageNumber: number;
   pageSize: number;
   next_page_params?: {
-    startBlock: null;
+    startBlock: string;
     endBlock: string;
     pageNumber: number;
     pageSize: number;

types/api/transaction.ts

@@ -2,8 +2,8 @@ import type { AddressParam } from './addressParams';
 import type { BlockTransactionsResponse } from './block';
 import type { DecodedInput } from './decodedInput';
 import type { Fee } from './fee';
-import type { L2WithdrawalStatus } from './l2Withdrawals';
 import type { NovesTxTranslation } from './noves';
+import type { OptimisticL2WithdrawalStatus } from './optimisticL2';
 import type { TokenInfo } from './token';
 import type { TokenTransfer } from './tokenTransfer';
 import type { TxAction } from './txAction';

ui/address/AddressAccountHistory.tsx

@@ -14,7 +14,6 @@ import AddressAccountHistoryTableItem from 'ui/address/accountHistory/AddressAcc
 import ActionBar from 'ui/shared/ActionBar';
 import DataListDisplay from 'ui/shared/DataListDisplay';
 import { getFromToValue } from 'ui/shared/Noves/utils';
-import Pagination from 'ui/shared/pagination/Pagination';
 import useQueryWithPages from 'ui/shared/pagination/useQueryWithPages';
 import TheadSticky from 'ui/shared/TheadSticky';
 
@@ -58,7 +57,6 @@ const AddressAccountHistory = ({ scrollRef }: Props) => {
         isLoading={ pagination.isLoading }
       />
 
-      <Pagination ml={{ base: 'auto', lg: 8 }} { ...pagination }/>
     </ActionBar>
   );
 
@@ -108,22 +106,17 @@ const AddressAccountHistory = ({ scrollRef }: Props) => {
   );
 
   return (
-    <>
-      { /* should stay before tabs to scroll up with pagination */ }
-      <Box ref={ scrollRef }></Box>
-
-      <DataListDisplay
-        isError={ isError }
-        items={ filteredData }
-        emptyText="There are no transactions."
-        content={ content }
-        actionBar={ actionBar }
-        filterProps={{
-          hasActiveFilters: Boolean(filterValue),
-          emptyFilteredText: 'No match found for current filter',
-        }}
-      />
-    </>
+    <DataListDisplay
+      isError={ isError }
+      items={ filteredData }
+      emptyText="There are no transactions."
+      content={ content }
+      actionBar={ actionBar }
+      filterProps={{
+        hasActiveFilters: Boolean(filterValue),
+        emptyFilteredText: 'No match found for current filter',
+      }}
+    />
   );
 };
 

ui/address/accountHistory/AddressAccountHistoryListItem.tsx

@@ -1,5 +1,5 @@
 import { Box, Flex, Skeleton, Text } from '@chakra-ui/react';
-import React from 'react';
+import React, { useMemo } from 'react';
 
 import type { NovesResponseData } from 'types/api/noves';
 
@@ -17,6 +17,12 @@ type Props = {
 
 const AddressAccountHistoryListItem = (props: Props) => {
 
+  const parsedDescription = useMemo(() => {
+    const description = props.tx.classificationData.description;
+
+    return description.endsWith('.') ? description.substring(0, description.length - 1) : description;
+  }, [ props.tx.classificationData.description ]);
+
   return (
     <ListItemMobile rowGap={ 4 } w="full">
       <Skeleton borderRadius="sm" isLoaded={ !props.isPlaceholderData } w="full">
@@ -46,7 +52,7 @@ const AddressAccountHistoryListItem = (props: Props) => {
           whiteSpace="break-spaces"
           wordBreak="break-word"
         >
-          { props.tx.classificationData.description }
+          { parsedDescription }
         </LinkInternal>
       </Skeleton>
 

ui/address/accountHistory/AddressAccountHistoryTableItem.tsx

@@ -1,5 +1,5 @@
 import { Td, Tr, Skeleton, Text, Box } from '@chakra-ui/react';
-import React from 'react';
+import React, { useMemo } from 'react';
 
 import type { NovesResponseData } from 'types/api/noves';
 
@@ -16,16 +16,22 @@ type Props = {
 
 const AddressAccountHistoryTableItem = (props: Props) => {
 
+  const parsedDescription = useMemo(() => {
+    const description = props.tx.classificationData.description;
+
+    return description.endsWith('.') ? description.substring(0, description.length - 1) : description;
+  }, [ props.tx.classificationData.description ]);
+
   return (
     <Tr>
-      <Td px={ 3 } py="18px" fontSize="sm" borderColor="gray.200">
+      <Td px={ 3 } py="18px" fontSize="sm" borderColor="gray.200" _dark={{ borderColor: 'whiteAlpha.200' }}>
         <Skeleton borderRadius="sm" flexShrink={ 0 } isLoaded={ !props.isPlaceholderData }>
           <Text as="span" color="text_secondary">
             { dayjs(props.tx.rawTransactionData.timestamp * 1000).fromNow() }
           </Text>
         </Skeleton>
       </Td>
-      <Td px={ 3 } py="18px" fontSize="sm" borderColor="gray.200" >
+      <Td px={ 3 } py="18px" fontSize="sm" borderColor="gray.200" _dark={{ borderColor: 'whiteAlpha.200' }}>
         <Skeleton borderRadius="sm" isLoaded={ !props.isPlaceholderData }>
           <Box display="flex">
             <IconSvg
@@ -43,12 +49,12 @@ const AddressAccountHistoryTableItem = (props: Props) => {
               whiteSpace="break-spaces"
               wordBreak="break-word"
             >
-              { props.tx.classificationData.description }
+              { parsedDescription }
             </LinkInternal>
           </Box>
         </Skeleton>
       </Td>
-      <Td px={ 3 } py="18px" fontSize="sm" borderColor="gray.200" >
+      <Td px={ 3 } py="18px" fontSize="sm" borderColor="gray.200" _dark={{ borderColor: 'whiteAlpha.200' }}>
         <Box flexShrink={ 0 } >
           <NovesFromTo txData={ props.tx } currentAddress={ props.currentAddress } isLoaded={ !props.isPlaceholderData }/>
         </Box>

ui/shared/Noves/NovesFromTo.tsx

@@ -1,11 +1,12 @@
-import { Box, Skeleton, Tag, TagLabel } from '@chakra-ui/react';
+import { Box, Skeleton } from '@chakra-ui/react';
 import type { FC } from 'react';
 import React from 'react';
 
 import type { NovesResponseData } from 'types/api/noves';
 
 import type { NovesFlowViewItem } from 'ui/tx/assetFlows/utils/generateFlowViewData';
 
+import Tag from '../chakra/Tag';
 import AddressEntity from '../entities/address/AddressEntity';
 import { getActionFromTo, getFromTo } from './utils';
 
@@ -38,22 +39,18 @@ const NovesFromTo: FC<Props> = ({ isLoaded, txData, currentAddress = '', item })
         <Tag
           colorScheme={ isSent ? 'yellow' : 'green' }
           px={ 0 }
-          pos="relative"
-          minW="max-content"
+          w="113px"
+          textAlign="center"
         >
-          <TagLabel
-            w="113px"
-            textAlign="center"
-          >
-            { data.text }
-          </TagLabel>
+          { data.text }
         </Tag>
 
         <AddressEntity
           address={ address }
           fontWeight="500"
           noCopy={ !data.address }
           noLink={ !data.address }
+          noIcon={ address.name === 'Validators' }
           ml={ 2 }
           truncation="dynamic"
         />

ui/shared/pagination/useQueryWithPages.ts

@@ -41,6 +41,17 @@ function getNextPageParams<R extends PaginatedResources>(data: ResourcePayload<R
     return;
   }
 
+  const nextPageParams = data.next_page_params;
+  if (nextPageParams) {
+    // check if a page param is "null" and remove it
+
+    return Object.entries(nextPageParams)
+    //eslint-disable-next-line @typescript-eslint/no-unused-vars
+      .filter(([ _, v ]) => v != null)
+      .reduce((acc, [ k, v ]) => ({ ...acc, [k]: v }), {});
+
+  }
+
   return data.next_page_params;
 }