Merge pull request #1374 from nervosnetwork/develop

Merge develop into testnet

.eslintrc.js

@@ -1,4 +1,5 @@
 module.exports = {
+  root: true,
   extends: ['airbnb', 'plugin:prettier/recommended'],
   parser: '@typescript-eslint/parser',
   plugins: ['@typescript-eslint', 'react-hooks', 'unused-imports'],
@@ -99,7 +100,15 @@ module.exports = {
         allow: ['^.*_'],
       },
     ],
+    // The service layer uses the singleton pattern, so there will be many methods that do not use this.
+    'class-methods-use-this': 'off',
+    // TODO: Perhaps @typescript-eslint/recommended should be used.
     '@typescript-eslint/array-type': 'error',
+    'no-dupe-class-members': 'off',
+    '@typescript-eslint/no-dupe-class-members': 'error',
+    'lines-between-class-members': 'off',
+    // It looks like this rule has a bug, and it seems that typescript-eslint missed this rule when supporting eslint v8.
+    '@typescript-eslint/lines-between-class-members': 'off',
   },
   env: {
     jest: true,

src/App.tsx

@@ -3,7 +3,6 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { DefaultTheme, ThemeProvider } from 'styled-components'
 import Routers from './routes'
 import Toast from './components/Toast'
-import useInitApp from './contexts/providers/hook'
 import { isMainnet } from './utils/chain'
 import { DASQueryContextProvider } from './contexts/providers/dasQuery'
 import { getPrimaryColor, getSecondaryColor } from './constants/common'
@@ -17,7 +16,6 @@ const appStyle = {
 const queryClient = new QueryClient()
 
 const App = () => {
-  useInitApp()
   const theme = useMemo<DefaultTheme>(
     () => ({
       primary: getPrimaryColor(),

src/__tests__/utils/date.test.ts

@@ -11,7 +11,6 @@ import {
   parseSimpleDate,
   parseSimpleDateNoSecond,
   getCurrentYear,
-  getCSTTime,
 } from '../../utils/date'
 
 describe('Date methods tests', () => {
@@ -81,13 +80,4 @@ describe('Date methods tests', () => {
     MockDate.set(1588694400000)
     expect(getCurrentYear()).toBe(2020)
   })
-
-  it('getCSTTime', async () => {
-    timezoneMock.register('UTC')
-    expect(parseSimpleDate(1588651000000)).toBe('2020/05/05 03:56:40')
-    MockDate.set(1588651000000, 0)
-    expect(getCSTTime()).toBe(1588679800000)
-    timezoneMock.register('UTC')
-    expect(parseSimpleDate(1588679800000)).toBe('2020/05/05 11:56:40')
-  })
 })

src/components/Header/BlockchainComp/index.tsx

@@ -8,10 +8,9 @@ import { HeaderBlockchainPanel, MobileSubMenuPanel } from './styled'
 import SimpleButton from '../../SimpleButton'
 import ChainDropdown from '../../Dropdown/ChainType'
 import { useIsMobile } from '../../../utils/hook'
-import { ChainName, MAINNET_URL, TESTNET_URL } from '../../../constants/common'
+import { ChainName, MAINNET_URL, ONE_DAY_MILLISECOND, TESTNET_URL } from '../../../constants/common'
 import { explorerService } from '../../../services/ExplorerService'
-import { AppCachedKeys } from '../../../constants/cache'
-import { fetchCachedData, storeCachedData } from '../../../utils/cache'
+import { cacheService } from '../../../services/CacheService'
 
 const getDropdownIcon = (showDropdown: boolean) => {
   if (!showDropdown) return WhiteDropdownIcon
@@ -123,24 +122,12 @@ export default memo(() => {
     ['node_version'],
     async () => {
       const { version } = await explorerService.api.fetchNodeVersion()
-      storeCachedData(AppCachedKeys.Version, `${version}&${new Date().getTime()}`)
+      cacheService.set<string>('node_version', version, { expireTime: ONE_DAY_MILLISECOND })
       return version
     },
     {
       keepPreviousData: true,
-      initialData: () => {
-        // version cache format: version&timestamp
-        const data = fetchCachedData<string>(AppCachedKeys.Version)
-        if (!data?.includes('&')) return undefined
-
-        const timestamp = Number(data.substring(data.indexOf('&') + 1))
-        const DAY_TIMESTAMP = 24 * 60 * 60 * 1000
-        const isStale = Date.now() - timestamp > DAY_TIMESTAMP
-        if (isStale) return undefined
-
-        const nodeVersion = data.substring(0, data.indexOf('&'))
-        return nodeVersion
-      },
+      initialData: () => cacheService.get<string>('node_version'),
     },
   )
   const nodeVersion = query.data ?? ''

src/components/Sheet/index.tsx

@@ -1,18 +1,13 @@
 import { useTranslation } from 'react-i18next'
+import { useMemo } from 'react'
 import { SheetPanel, SheetPointPanel, SheetItem } from './styled'
-import { createGlobalState, createGlobalStateSetter, useGlobalState } from '../../utils/state'
-
-const globalNetworkErrMsgs = createGlobalState<string[]>([])
-const globalChainAlerts = createGlobalState<string[]>([])
-
-export const setNetworkErrMsgs = createGlobalStateSetter(globalNetworkErrMsgs)
-export const setChainAlerts = createGlobalStateSetter(globalChainAlerts)
+import { useBlockchainAlerts, useNetworkErrMsgs } from '../../services/ExplorerService'
 
 const Sheet = () => {
   const { t } = useTranslation()
-  const [networkErrMsgs] = useGlobalState(globalNetworkErrMsgs)
-  const [chainAlerts] = useGlobalState(globalChainAlerts)
-  const messages: string[] = chainAlerts.concat(networkErrMsgs)
+  const networkErrMsgs = useNetworkErrMsgs()
+  const chainAlerts = useBlockchainAlerts()
+  const messages = useMemo<string[]>(() => [...chainAlerts, ...networkErrMsgs], [chainAlerts, networkErrMsgs])
 
   return messages.length > 0 ? (
     <SheetPanel>

src/constants/common.ts

@@ -11,7 +11,10 @@ export const PAGE_CELL_COUNT = 200
 export const NEXT_HARD_FORK_EPOCH = 5414
 export const EPOCH_HOURS = 4
 export const ONE_DAY_SECOND = 24 * 60 * 60
+export const ONE_DAY_MILLISECOND = ONE_DAY_SECOND * 1000
+export const ONE_YEAR_MILLISECOND = ONE_DAY_MILLISECOND * 365
 export const ONE_HOUR_SECOND = 60 * 60
+export const ONE_HOUR_MILLISECOND = ONE_HOUR_SECOND * 1000
 export const ONE_MINUTE_SECOND = 60
 export const EPOCHS_PER_HALVING = 8760
 export const THEORETICAL_EPOCH_TIME = 1000 * 60 * 60 * 4 // 4 hours

src/pages/Home/AverageBlockTimeChart/index.tsx

@@ -10,8 +10,8 @@ import { HomeChartLink, ChartLoadingPanel } from './styled'
 import ChartNoDataImage from '../../../assets/chart_no_data_white.png'
 import { useChartQueryWithCache, useIsLGScreen } from '../../../utils/hook'
 import { ChartItem, explorerService } from '../../../services/ExplorerService'
-import { ChartCachedKeys } from '../../../constants/cache'
 import { ReactChartCore } from '../../StatisticsChart/common'
+import { AverageBlockTimeCacheKey } from '../../StatisticsChart/block/AverageBlockTime'
 
 const useOption = () => {
   const { t } = useTranslation()
@@ -111,7 +111,7 @@ export default memo(() => {
 
   const query = useChartQueryWithCache(
     explorerService.api.fetchStatisticAverageBlockTimes,
-    ChartCachedKeys.AverageBlockTime,
+    AverageBlockTimeCacheKey,
     'date',
   )
   const fullStatisticAverageBlockTimes = useMemo(() => query.data ?? [], [query.data])

src/pages/Home/HashRateChart/index.tsx

@@ -11,8 +11,8 @@ import { HomeChartLink, ChartLoadingPanel } from './styled'
 import ChartNoDataImage from '../../../assets/chart_no_data_white.png'
 import { useChartQueryWithCache, useIsLGScreen } from '../../../utils/hook'
 import { ChartItem, explorerService } from '../../../services/ExplorerService'
-import { ChartCachedKeys } from '../../../constants/cache'
 import { ReactChartCore } from '../../StatisticsChart/common'
+import { HashRateCacheKey } from '../../StatisticsChart/mining/HashRate'
 
 const useOption = () => {
   const { t } = useTranslation()
@@ -103,7 +103,7 @@ const useOption = () => {
 }
 export default memo(() => {
   const isLG = useIsLGScreen()
-  const query = useChartQueryWithCache(explorerService.api.fetchStatisticHashRate, ChartCachedKeys.HashRate, 'date')
+  const query = useChartQueryWithCache(explorerService.api.fetchStatisticHashRate, HashRateCacheKey, 'date')
   const fullStatisticHashRates = useMemo(() => query.data ?? [], [query.data])
   const parseOption = useOption()
 

src/pages/Home/index.tsx

@@ -14,23 +14,17 @@ import {
 } from './styled'
 import Content from '../../components/Content'
 import { parseTime, parseTimeNoSecond } from '../../utils/date'
-import {
-  BLOCK_POLLING_TIME,
-  BLOCKCHAIN_ALERT_POLLING_TIME,
-  ListPageParams,
-  DELAY_BLOCK_NUMBER,
-} from '../../constants/common'
+import { BLOCK_POLLING_TIME, ListPageParams, DELAY_BLOCK_NUMBER } from '../../constants/common'
 import { localeNumberString, handleHashRate, handleDifficulty } from '../../utils/number'
 import { handleBigNumber } from '../../utils/string'
 import { isMainnet } from '../../utils/chain'
 import LatestBlocksIcon from '../../assets/latest_blocks.png'
 import LatestTransactionsIcon from '../../assets/latest_transactions.png'
 import { BlockCardItem, TransactionCardItem } from './TableCard'
 import Loading from '../../components/Loading/SmallLoading'
-import { useElementIntersecting, useInterval, useIsLGScreen, useIsMobile } from '../../utils/hook'
+import { useElementIntersecting, useIsLGScreen, useIsMobile } from '../../utils/hook'
 import Banner from '../../components/Banner'
 import { HalvingBanner } from '../../components/Banner/HalvingBanner'
-import { handleBlockchainAlert } from '../../service/app/blockchain'
 import Search from '../../components/Search'
 import AverageBlockTimeChart from './AverageBlockTimeChart'
 import HashRateChart from './HashRateChart'
@@ -233,10 +227,6 @@ export default () => {
     [transactionsQuery.data?.transactions],
   )
 
-  useInterval(() => {
-    handleBlockchainAlert()
-  }, BLOCKCHAIN_ALERT_POLLING_TIME)
-
   const blockchainDataList = useBlockchainDataList(isMobile, isLG)
 
   return (

src/pages/StatisticsChart/activities/AddressBalanceRank.tsx

@@ -7,7 +7,6 @@ import { shannonToCkb, shannonToCkbDecimal } from '../../../utils/util'
 import { localeNumberString } from '../../../utils/number'
 import { tooltipColor, tooltipWidth, SmartChartPage, SmartChartPageProps } from '../common'
 import { ChartItem, explorerService } from '../../../services/ExplorerService'
-import { ChartCachedKeys } from '../../../constants/cache'
 import { useAdaptPCEllipsis } from '../../../utils/hook'
 import { ChartColorConfig } from '../../../constants/common'
 
@@ -144,7 +143,7 @@ export const AddressBalanceRankChart = ({ isThumbnail = false }: { isThumbnail?:
       onFetched={setStatisticAddressBalanceRanks}
       getEChartOption={getEChartOption}
       toCSV={toCSV}
-      cacheKey={ChartCachedKeys.AddressBalanceRank}
+      cacheKey="AddressBalanceRank"
       cacheMode="date"
     />
   )

src/pages/StatisticsChart/activities/AddressCount.tsx

@@ -4,7 +4,6 @@ import { DATA_ZOOM_CONFIG, assertIsArray, handleAxis } from '../../../utils/char
 import { parseDateNoTime } from '../../../utils/date'
 import { tooltipColor, tooltipWidth, SmartChartPage } from '../common'
 import { ChartItem, explorerService } from '../../../services/ExplorerService'
-import { ChartCachedKeys } from '../../../constants/cache'
 import { useCurrentLanguage } from '../../../utils/i18n'
 import { ChartColorConfig } from '../../../constants/common'
 
@@ -109,7 +108,7 @@ export const AddressCountChart = ({ isThumbnail = false }: { isThumbnail?: boole
       fetchData={explorerService.api.fetchStatisticAddressCount}
       getEChartOption={useOption}
       toCSV={toCSV}
-      cacheKey={ChartCachedKeys.AddressCount}
+      cacheKey="AddressCount"
       cacheMode="date"
     />
   )

src/pages/StatisticsChart/activities/BalanceDistribution.tsx

@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js'
 import { useTranslation } from 'react-i18next'
-import { LanuageType, useCurrentLanguage } from '../../../utils/i18n'
+import { SupportedLng, useCurrentLanguage } from '../../../utils/i18n'
 import {
   DATA_ZOOM_CONFIG,
   assertIsArray,
@@ -11,7 +11,6 @@ import {
 } from '../../../utils/chart'
 import { tooltipColor, tooltipWidth, SeriesItem, SmartChartPage } from '../common'
 import { localeNumberString } from '../../../utils/number'
-import { ChartCachedKeys } from '../../../constants/cache'
 import { ChartItem, explorerService } from '../../../services/ExplorerService'
 import { ChartColorConfig } from '../../../constants/common'
 
@@ -22,7 +21,7 @@ const parseTooltip = ({
   data,
   color,
   currentLanguage,
-}: SeriesItem & { data: string; currentLanguage: LanuageType }): string => {
+}: SeriesItem & { data: string; currentLanguage: SupportedLng }): string => {
   return `<div>${tooltipColor(color)}${widthSpan(seriesName, currentLanguage)} ${localeNumberString(data)}</div>`
 }
 
@@ -188,7 +187,7 @@ export const BalanceDistributionChart = ({ isThumbnail = false }: { isThumbnail?
       fetchData={explorerService.api.fetchStatisticBalanceDistribution}
       getEChartOption={useOption}
       toCSV={toCSV}
-      cacheKey={ChartCachedKeys.BalanceDistribution}
+      cacheKey="BalanceDistribution"
       cacheMode="date"
     />
   )

src/pages/StatisticsChart/activities/CellCount.tsx

@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js'
 import { useTranslation } from 'react-i18next'
-import { LanuageType, useCurrentLanguage } from '../../../utils/i18n'
+import { SupportedLng, useCurrentLanguage } from '../../../utils/i18n'
 import {
   DATA_ZOOM_CONFIG,
   assertIsArray,
@@ -10,11 +10,10 @@ import {
 } from '../../../utils/chart'
 import { parseDateNoTime } from '../../../utils/date'
 import { tooltipColor, tooltipWidth, SeriesItem, SmartChartPage } from '../common'
-import { ChartCachedKeys } from '../../../constants/cache'
 import { ChartItem, explorerService } from '../../../services/ExplorerService'
 import { ChartColorConfig } from '../../../constants/common'
 
-const widthSpan = (value: string, currentLanguage: LanuageType) =>
+const widthSpan = (value: string, currentLanguage: SupportedLng) =>
   tooltipWidth(value, currentLanguage === 'en' ? 125 : 80)
 
 const useTooltip = () => {
@@ -195,7 +194,7 @@ export const CellCountChart = ({ isThumbnail = false }: { isThumbnail?: boolean
       fetchData={explorerService.api.fetchStatisticCellCount}
       getEChartOption={useOption}
       toCSV={toCSV}
-      cacheKey={ChartCachedKeys.CellCount}
+      cacheKey="CellCount"
       cacheMode="date"
     />
   )

src/pages/StatisticsChart/activities/TransactionCount.tsx

@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next'
 import { DATA_ZOOM_CONFIG, assertIsArray, handleAxis } from '../../../utils/chart'
 import { parseDateNoTime } from '../../../utils/date'
 import { tooltipColor, tooltipWidth, SmartChartPage } from '../common'
-import { ChartCachedKeys } from '../../../constants/cache'
 import { ChartItem, explorerService } from '../../../services/ExplorerService'
 import { useCurrentLanguage } from '../../../utils/i18n'
 import { ChartColorConfig } from '../../../constants/common'
@@ -107,7 +106,7 @@ export const TransactionCountChart = ({ isThumbnail = false }: { isThumbnail?: b
       fetchData={explorerService.api.fetchStatisticTransactionCount}
       getEChartOption={useOption}
       toCSV={toCSV}
-      cacheKey={ChartCachedKeys.TransactionCount}
+      cacheKey="TransactionCount"
       cacheMode="date"
     />
   )

src/pages/StatisticsChart/activities/TxFeeHistory.tsx

@@ -5,7 +5,6 @@ import { parseDateNoTime } from '../../../utils/date'
 import { tooltipColor, tooltipWidth, SmartChartPage } from '../common'
 import { shannonToCkbDecimal } from '../../../utils/util'
 import { isMainnet } from '../../../utils/chain'
-import { ChartCachedKeys } from '../../../constants/cache'
 import { ChartItem, explorerService } from '../../../services/ExplorerService'
 import { useCurrentLanguage } from '../../../utils/i18n'
 import { ChartColorConfig } from '../../../constants/common'
@@ -113,7 +112,7 @@ export const TxFeeHistoryChart = ({ isThumbnail = false }: { isThumbnail?: boole
       fetchData={explorerService.api.fetchStatisticTxFeeHistory}
       getEChartOption={useOption}
       toCSV={toCSV}
-      cacheKey={ChartCachedKeys.TransactionFee}
+      cacheKey="TransactionFee"
       cacheMode="date"
     />
   )