diff --git a/packages/page-parachains/src/Crowdloan/Fund.tsx b/packages/page-parachains/src/Crowdloan/Fund.tsx index d86a155667..caa9ce6232 100644 --- a/packages/page-parachains/src/Crowdloan/Fund.tsx +++ b/packages/page-parachains/src/Crowdloan/Fund.tsx @@ -25,6 +25,7 @@ interface Props { function Fund ({ bestNumber, className, isOngoing, value: { info: { cap, depositor, end, firstSlot, lastSlot, raised, retiring }, paraId } }: Props): React.ReactElement { const { t } = useTranslation(); const { api } = useApi(); + const blocksLeft = useMemo( () => bestNumber && end.gt(bestNumber) && end.sub(bestNumber), [bestNumber, end] diff --git a/packages/page-parachains/src/Crowdloan/Funds.tsx b/packages/page-parachains/src/Crowdloan/Funds.tsx index 2d85742918..6e8dc2c750 100644 --- a/packages/page-parachains/src/Crowdloan/Funds.tsx +++ b/packages/page-parachains/src/Crowdloan/Funds.tsx @@ -4,7 +4,7 @@ import type BN from 'bn.js'; import type { Campaign } from './types'; -import React, { useRef } from 'react'; +import React, { useMemo, useRef } from 'react'; import { Table } from '@polkadot/react-components'; @@ -17,6 +17,12 @@ interface Props { value: Campaign[] | null; } +function extractLists (value: Campaign[] | null): [Campaign[] | null, Campaign[] | null] { + return value + ? [value.filter(({ isEnded }) => !isEnded), value.filter(({ isEnded }) => isEnded)] + : [null, null]; +} + function Funds ({ bestNumber, className, value }: Props): React.ReactElement { const { t } = useTranslation(); @@ -35,31 +41,36 @@ function Funds ({ bestNumber, className, value }: Props): React.ReactElement extractLists(value), + [value] + ); + return ( <> ('No active campaigns found')} + empty={active && t('No active campaigns found')} header={headerActiveRef.current} > - {value?.filter(({ isEnded }) => !isEnded).map((fund) => ( + {active?.map((fund) => ( ))}
('No completed campaigns found')} + empty={ended && t('No completed campaigns found')} header={headedEndedRef.current} > - {value?.filter(({ isEnded }) => isEnded).map((fund) => ( + {ended?.map((fund) => ( ))} diff --git a/packages/page-parachains/src/Crowdloan/types.ts b/packages/page-parachains/src/Crowdloan/types.ts index 89c02d90f1..0d214cc154 100644 --- a/packages/page-parachains/src/Crowdloan/types.ts +++ b/packages/page-parachains/src/Crowdloan/types.ts @@ -6,5 +6,6 @@ import type { FundInfo, ParaId } from '@polkadot/types/interfaces'; export interface Campaign { info: FundInfo; isEnded?: boolean; + key: string; paraId: ParaId; } diff --git a/packages/page-parachains/src/Crowdloan/useFunds.ts b/packages/page-parachains/src/Crowdloan/useFunds.ts index 564f8b3222..2dbee05ff0 100644 --- a/packages/page-parachains/src/Crowdloan/useFunds.ts +++ b/packages/page-parachains/src/Crowdloan/useFunds.ts @@ -31,7 +31,7 @@ const EMPTY: Result = { function extractCampaigns (optFunds: Option[], paraIds: ParaId[]): Campaign[] | null { return optFunds && paraIds.length === optFunds.length ? paraIds - .map((paraId, i) => ({ info: optFunds[i].unwrapOr(null), paraId })) + .map((paraId, i) => ({ info: optFunds[i].unwrapOr(null), key: paraId.toString(), paraId })) .filter((fund): fund is Campaign => !!fund.info) : null; } diff --git a/packages/page-parachains/src/Overview/Parachain.tsx b/packages/page-parachains/src/Overview/Parachain.tsx index 66b1367a10..b991875d73 100644 --- a/packages/page-parachains/src/Overview/Parachain.tsx +++ b/packages/page-parachains/src/Overview/Parachain.tsx @@ -4,7 +4,7 @@ import type { Option, Vec } from '@polkadot/types'; import type { AccountId, BlockNumber, CandidatePendingAvailability, HeadData, Header, ParaId, ParaLifecycle } from '@polkadot/types/interfaces'; import type { Codec } from '@polkadot/types/types'; -import type { QueuedAction } from './types'; +import type { EventMapInfo, QueuedAction } from './types'; import BN from 'bn.js'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; @@ -23,8 +23,9 @@ interface Props { className?: string; id: ParaId; isScheduled?: boolean; - lastBacked?: [string, string, BN]; - lastInclusion?: [string, string, BN]; + lastBacked?: EventMapInfo; + lastInclusion?: EventMapInfo; + lastTimeout?: EventMapInfo; nextAction?: QueuedAction; sessionValidators?: AccountId[] | null; validators?: AccountId[]; @@ -75,7 +76,16 @@ const optionsMulti = { }) }; -function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, lastInclusion, nextAction, sessionValidators, validators }: Props): React.ReactElement { +function renderAddresses (list?: AccountId[]): JSX.Element[] | undefined { + return list?.map((id) => ( + + )); +} + +function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, lastInclusion, lastTimeout, nextAction, sessionValidators, validators }: Props): React.ReactElement { const { t } = useTranslation(); const { api } = useApi(); const { api: paraApi } = useParaApi(id); @@ -96,7 +106,7 @@ function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, l const blockDelay = useMemo( () => bestNumber && ( lastInclusion - ? bestNumber.sub(lastInclusion[2]) + ? bestNumber.sub(lastInclusion.blockNumber) : paraInfo.watermark ? bestNumber.sub(paraInfo.watermark) : undefined @@ -105,22 +115,12 @@ function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, l ); const valRender = useCallback( - () => validators?.map((id) => ( - - )), + () => renderAddresses(validators), [validators] ); const bckRender = useCallback( - () => nonBacked.map((id) => ( - - )), + () => renderAddresses(nonBacked), [nonBacked] ); @@ -144,12 +144,14 @@ function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, l return ( - + - - - + +

{formatNumber(id)}

{isScheduled && ( - - )} + {isScheduled && ( + + )} + {validators && validators.length !== 0 && ( @@ -174,18 +176,23 @@ function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, l {blockDelay && } + {lastInclusion - ? {formatNumber(lastInclusion[2])} + ? {formatNumber(lastInclusion.blockNumber)} : paraInfo.watermark && formatNumber(paraInfo.watermark) } + {lastBacked && - {formatNumber(lastBacked[2])} + {formatNumber(lastBacked.blockNumber)} } {paraBest && <>{formatNumber(paraBest)}} + {lastTimeout && + {formatNumber(lastTimeout.blockNumber)} + } + {paraBest && <>{formatNumber(paraBest)}} {paraInfo.updateAt && bestNumber && ( <> diff --git a/packages/page-parachains/src/Overview/Parachains.tsx b/packages/page-parachains/src/Overview/Parachains.tsx index d003eebf43..bef92739dd 100644 --- a/packages/page-parachains/src/Overview/Parachains.tsx +++ b/packages/page-parachains/src/Overview/Parachains.tsx @@ -1,10 +1,12 @@ // Copyright 2017-2021 @polkadot/app-parachains authors & contributors // SPDX-License-Identifier: Apache-2.0 +import type { ApiPromise } from '@polkadot/api'; import type { SignedBlockExtended } from '@polkadot/api-derive/types'; import type { AccountId, CandidateReceipt, Event, ParaId, ParaValidatorIndex } from '@polkadot/types/interfaces'; +import type { IEvent } from '@polkadot/types/types'; import type { ScheduledProposals } from '../types'; -import type { QueuedAction } from './types'; +import type { EventMapInfo, QueuedAction } from './types'; import BN from 'bn.js'; import React, { useEffect, useMemo, useRef, useState } from 'react'; @@ -21,92 +23,110 @@ interface Props { scheduled?: ScheduledProposals[]; } -type EventMap = Record; +type EventMap = Record; interface LastEvents { lastBacked: EventMap; lastIncluded: EventMap; + lastTimeout: EventMap; } +const EMPTY_EVENTS: LastEvents = { lastBacked: {}, lastIncluded: {}, lastTimeout: {} }; + const optionsMulti = { defaultValue: [null, null] as [AccountId[] | null, ParaValidatorIndex[][] | null] }; function includeEntry (map: EventMap, event: Event, blockHash: string, blockNumber: BN): void { - const { descriptor } = event.data[0] as CandidateReceipt; + const { descriptor } = (event as unknown as IEvent<[CandidateReceipt]>).data[0]; if (descriptor) { - map[descriptor.paraId.toString()] = [ + map[descriptor.paraId.toString()] = { blockHash, - descriptor.relayParent.toHex(), - blockNumber - ]; + blockNumber, + relayParent: descriptor.relayParent.toHex() + }; } } +function extractScheduledIds (scheduled: ScheduledProposals[] = []): Record { + return scheduled.reduce((all: Record, { scheduledIds }: ScheduledProposals): Record => + scheduledIds.reduce((all: Record, id) => ({ + ...all, + [id.toString()]: true + }), all), {}); +} + +function mapValidators (ids?: ParaId[], validators?: AccountId[] | null, validatorGroups?: ParaValidatorIndex[][] | null): AccountId[][] { + return validators && validatorGroups && ids && ids.length === validatorGroups.length + ? validatorGroups.map((ids) => + ids + .map((id) => validators[id.toNumber()]) + .filter((a) => a) + ) + : []; +} + +function extractEvents (api: ApiPromise, lastBlock: SignedBlockExtended, prev: LastEvents): LastEvents { + const backed: EventMap = {}; + const included: EventMap = {}; + const timeout: EventMap = {}; + const blockNumber = lastBlock.block.header.number.unwrap(); + const blockHash = lastBlock.block.header.hash.toHex(); + let wasBacked = false; + let wasIncluded = false; + let wasTimeout = false; + + lastBlock.events.forEach(({ event, phase }) => { + if (phase.isApplyExtrinsic) { + if (api.events.inclusion.CandidateBacked.is(event)) { + includeEntry(backed, event, blockHash, blockNumber); + wasBacked = true; + } else if (api.events.inclusion.CandidateIncluded.is(event)) { + includeEntry(included, event, blockHash, blockNumber); + wasIncluded = true; + } else if (api.events.inclusion.CandidateTimedOut.is(event)) { + includeEntry(timeout, event, blockHash, blockNumber); + wasTimeout = true; + } + } + }); + + return wasBacked || wasIncluded || wasTimeout + ? { + lastBacked: wasBacked + ? { ...prev.lastBacked, ...backed } + : prev.lastBacked, + lastIncluded: wasIncluded + ? { ...prev.lastIncluded, ...included } + : prev.lastIncluded, + lastTimeout: wasTimeout + ? { ...prev.lastTimeout, ...timeout } + : prev.lastTimeout + } + : prev; +} + +function extractActions (actionsQueue: QueuedAction[], knownIds?: [ParaId, string][]): Record { + return actionsQueue && knownIds + ? knownIds.reduce((all: Record, [id, key]) => ({ + ...all, + [key]: actionsQueue.find(({ paraIds }) => paraIds.some((p) => p.eq(id))) + }), {}) + : {}; +} + function Parachains ({ actionsQueue, ids, scheduled }: Props): React.ReactElement { const { t } = useTranslation(); const { api } = useApi(); const bestNumber = useBestNumber(); const lastBlock = useCall(api.derive.chain.subscribeNewBlocks); - const [{ lastBacked, lastIncluded }, setLastEvents] = useState({ lastBacked: {}, lastIncluded: {} }); + const [{ lastBacked, lastIncluded, lastTimeout }, setLastEvents] = useState(EMPTY_EVENTS); const [validators, validatorGroups] = useCallMulti<[AccountId[] | null, ParaValidatorIndex[][] | null]>([ api.query.session?.validators, api.query.paraScheduler?.validatorGroups || api.query.scheduler?.validatorGroups ], optionsMulti); - const scheduledIds = useMemo( - () => (scheduled || []).reduce((all: Record, { scheduledIds }: ScheduledProposals): Record => { - return scheduledIds.reduce((all: Record, id) => ({ ...all, [id.toString()]: true }), all); - }, {}), - [scheduled] - ); - - const validatorMap = useMemo( - () => validators && validatorGroups && ids && ids.length === validatorGroups.length - ? validatorGroups.map((ids) => - ids - .map((id) => validators[id.toNumber()]) - .filter((a) => a) - ) - : [], - [ids, validators, validatorGroups] - ); - - useEffect((): void => { - lastBlock && setLastEvents((prev) => { - const backed: Record = {}; - const included: Record = {}; - const blockNumber = lastBlock.block.header.number.unwrap(); - const blockHash = lastBlock.block.header.hash.toHex(); - let wasIncluded = false; - let wasBacked = false; - - lastBlock.events.forEach(({ event, phase }) => { - if (phase.isApplyExtrinsic) { - if (api.events.inclusion.CandidateBacked.is(event)) { - includeEntry(backed, event, blockHash, blockNumber); - wasBacked = true; - } else if (api.events.inclusion.CandidateIncluded.is(event)) { - includeEntry(included, event, blockHash, blockNumber); - wasIncluded = true; - } - } - }); - - return wasBacked || wasIncluded - ? { - lastBacked: wasBacked - ? { ...prev.lastBacked, ...backed } - : prev.lastBacked, - lastIncluded: wasIncluded - ? { ...prev.lastIncluded, ...included } - : prev.lastIncluded - } - : prev; - }); - }, [api, lastBlock]); - const headerRef = useRef([ [t('parachains'), 'start', 3], ['', 'media--1500'], @@ -114,28 +134,54 @@ function Parachains ({ actionsQueue, ids, scheduled }: Props): React.ReactElemen [t('lifecycle'), 'start media--1100'], [], [t('included'), undefined, 2], - [t('backed')], - [t('chain best'), 'media--900'], + [t('backed'), 'no-pad-left'], + [t('timeout'), 'no-pad-left'], + [t('chain best'), 'media--900 no-pad-left'], [t('upgrade'), 'media--1300'], [t('ump/dmp/hrmp'), 'media--1200'] ]); + const scheduledIds = useMemo( + () => extractScheduledIds(scheduled), + [scheduled] + ); + + const validatorMap = useMemo( + () => mapValidators(ids, validators, validatorGroups), + [ids, validators, validatorGroups] + ); + + const knownIds = useMemo( + () => ids?.map((id): [ParaId, string] => [id, id.toString()]), + [ids] + ); + + const nextActions = useMemo( + () => extractActions(actionsQueue, knownIds), + [actionsQueue, knownIds] + ); + + useEffect((): void => { + lastBlock && setLastEvents((prev) => + extractEvents(api, lastBlock, prev) + ); + }, [api, lastBlock]); + return ( ('There are no registered parachains')} + empty={knownIds && t('There are no registered parachains')} header={headerRef.current} > - {ids?.map((id, index): React.ReactNode => ( + {knownIds?.map(([id, key], index): React.ReactNode => ( - paraIds.some((p) => p.eq(id)) - )} + isScheduled={scheduledIds[key]} + key={key} + lastBacked={lastBacked[key]} + lastInclusion={lastIncluded[key]} + lastTimeout={lastTimeout[key]} + nextAction={nextActions[key]} sessionValidators={validators} validators={validatorMap[index]} /> diff --git a/packages/page-parachains/src/Overview/Summary.tsx b/packages/page-parachains/src/Overview/Summary.tsx index aac6d647f6..f9ca449cd7 100644 --- a/packages/page-parachains/src/Overview/Summary.tsx +++ b/packages/page-parachains/src/Overview/Summary.tsx @@ -7,7 +7,6 @@ import React from 'react'; import SummarySession from '@polkadot/app-explorer/SummarySession'; import { CardSummary, SummaryBox } from '@polkadot/react-components'; -import { useApi } from '@polkadot/react-hooks'; import { BestNumber } from '@polkadot/react-query'; import { formatNumber, isNumber } from '@polkadot/util'; @@ -22,17 +21,10 @@ interface Props { function Summary ({ leasePeriod, parachainCount, proposalCount, upcomingCount }: Props): React.ReactElement { const { t } = useTranslation(); - const { api } = useApi(); return (
- ('relay')}> - {api.query.paras - ? t('yes') - : t('no') - } - {isNumber(parachainCount) && ( ('parachains')}> {formatNumber(parachainCount)} diff --git a/packages/page-parachains/src/Overview/types.ts b/packages/page-parachains/src/Overview/types.ts index b44376ea5d..d3c414f272 100644 --- a/packages/page-parachains/src/Overview/types.ts +++ b/packages/page-parachains/src/Overview/types.ts @@ -20,3 +20,9 @@ export interface QueuedAction { paraIds: ParaId[]; sessionIndex: BN; } + +export interface EventMapInfo { + blockHash: string; + blockNumber: BN; + relayParent: string; +}