(lastInclusion && api.rpc.chain.getHeader, [lastInclusion && lastInclusion[1]], transformLast);
const blockDelay = useMemo(
() => lastRelayNumber && bestNumber && bestNumber.sub(lastRelayNumber).subn(1),
@@ -74,7 +74,12 @@ function Parachain ({ bestNumber, className = '', id, lastRelayParent }: Props):
| {chainLink} |
{headHex} |
{blockDelay && } |
- {lastRelayNumber && formatNumber(lastRelayNumber)} |
+
+ {lastInclusion && lastRelayNumber && (
+ {formatNumber(lastRelayNumber)}
+ )
+ }
+ |
{paraBest && formatNumber(paraBest)} |
{paraIssu && } |
diff --git a/packages/page-parachains/src/Overview/ParachainList.tsx b/packages/page-parachains/src/Overview/ParachainList.tsx
index 36af5ca8af..08d15c9a4d 100644
--- a/packages/page-parachains/src/Overview/ParachainList.tsx
+++ b/packages/page-parachains/src/Overview/ParachainList.tsx
@@ -1,7 +1,8 @@
// Copyright 2017-2021 @polkadot/app-parachains authors & contributors
// SPDX-License-Identifier: Apache-2.0
-import type { CandidateReceipt, EventRecord, Hash, ParaId } from '@polkadot/types/interfaces';
+import type { SignedBlockExtended } from '@polkadot/api-derive/type';
+import type { CandidateReceipt, ParaId } from '@polkadot/types/interfaces';
import BN from 'bn.js';
import React, { useEffect, useRef, useState } from 'react';
@@ -20,34 +21,38 @@ function ParachainList ({ ids }: Props): React.ReactElement {
const { t } = useTranslation();
const { api } = useApi();
const bestNumber = useCall(api.derive.chain.bestNumber);
- const eventRecords = useCall(api.query.system.events);
- const [lastIncluded, setLastIncluded] = useState>({});
+ const lastBlock = useCall(api.derive.chain.subscribeNewBlocks);
+ const [lastIncluded, setLastIncluded] = useState>({});
useEffect((): void => {
- eventRecords && setLastIncluded((prev) => {
- const updated: Record = {};
+ lastBlock && setLastIncluded((prev) => {
+ const updated: Record = {};
+ const blockHash = lastBlock.block.header.hash.toHex();
let wasUpdated = false;
- eventRecords.forEach(({ event, phase }) => {
- if (phase.isApplyExtrinsic && api.events.inclusion?.CandidateBacked.is(event)) {
+ lastBlock.events.forEach(({ event, phase }) => {
+ if (phase.isApplyExtrinsic && api.events.inclusion.CandidateBacked.is(event)) {
const { descriptor } = event.data[0] as CandidateReceipt;
- updated[descriptor.paraId.toString()] = descriptor.relayParent;
+ updated[descriptor.paraId.toString()] = [
+ blockHash,
+ descriptor.relayParent.toHex()
+ ];
wasUpdated = true;
}
});
return wasUpdated
- ? Object.entries(prev).reduce((updated: Record, [id, hash]): Record => {
+ ? Object.entries(prev).reduce((updated: Record, [id, hashes]): Record => {
if (!updated[id]) {
- updated[id] = hash;
+ updated[id] = hashes;
}
return updated;
}, updated)
: prev;
});
- }, [api, eventRecords]);
+ }, [api, lastBlock]);
const headerRef = useRef([
[t('parachains'), 'start', 2],
@@ -67,7 +72,7 @@ function ParachainList ({ ids }: Props): React.ReactElement {
bestNumber={bestNumber}
id={id}
key={id.toString()}
- lastRelayParent={lastIncluded[id.toString()]}
+ lastInclusion={lastIncluded[id.toString()]}
/>
))}