Use included block for delay para calc (#4672)

This commit is contained in:
Jaco Greeff 2021-02-16 08:46:16 +01:00 committed by GitHub
parent b4bf16f978
commit 6a65df52af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions

View File

@ -11,7 +11,7 @@ import React, { useCallback, useMemo } from 'react';
import { AddressMini, Badge, Expander, ParaLink } from '@polkadot/react-components';
import { useApi, useCall, useCallMulti, useParaApi } from '@polkadot/react-hooks';
import { BlockToTime } from '@polkadot/react-query';
import { BN_ONE, formatNumber } from '@polkadot/util';
import { formatNumber } from '@polkadot/util';
import { useTranslation } from '../translate';
import { sliceHex } from '../util';
@ -70,7 +70,6 @@ function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, l
const { api } = useApi();
const { api: paraApi } = useParaApi(id);
const paraBest = useCall<BlockNumber>(paraApi?.rpc.chain.subscribeNewHeads, undefined, transformHeader);
const lastRelayNumber = useCall<BN>(lastInclusion && api.rpc.chain.getHeader, [lastInclusion && lastInclusion[1]], transformHeader);
const paraInfo = useCallMulti<QueryState>([
[api.query.paras.heads, id],
[api.query.paras.futureCodeUpgrades, id],
@ -83,13 +82,13 @@ function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, l
const blockDelay = useMemo(
() => bestNumber && (
lastRelayNumber
? bestNumber.sub(lastRelayNumber).isub(BN_ONE)
lastInclusion
? bestNumber.sub(lastInclusion[2])
: paraInfo.watermark
? bestNumber.sub(paraInfo.watermark)
: undefined
),
[bestNumber, lastRelayNumber, paraInfo]
[bestNumber, lastInclusion, paraInfo]
);
const valRender = useCallback(
@ -123,8 +122,8 @@ function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, l
<td className='all start together hash'>{paraInfo.headHex}</td>
<td className='number'>{blockDelay && <BlockToTime blocks={blockDelay} />}</td>
<td className='number'>
{lastInclusion && lastRelayNumber
? <a href={`#/explorer/query/${lastInclusion[0]}`}>{formatNumber(lastRelayNumber)}</a>
{lastInclusion
? <a href={`#/explorer/query/${lastInclusion[0]}`}>{formatNumber(lastInclusion[2])}</a>
: paraInfo.watermark && formatNumber(paraInfo.watermark)
}
</td>

View File

@ -109,7 +109,7 @@ function ParachainList ({ ids, scheduled }: Props): React.ReactElement<Props> {
[t('parachains'), 'start', 3],
['', 'media--1500'],
[t('heads'), 'start'],
[t('included (parent)'), undefined, 2],
[t('included'), undefined, 2],
[t('backed')],
[t('chain best'), 'media--900'],
[t('upgrade'), 'media--1300'],