From 85b53f337b75a3530c019415a015873e6ffa83e9 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 15 Jan 2021 10:53:48 +0100 Subject: [PATCH] Fallback to watermark (no inclusion events) (#4422) --- .../src/Overview/Parachain.tsx | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/packages/page-parachains/src/Overview/Parachain.tsx b/packages/page-parachains/src/Overview/Parachain.tsx index da4fc5ae25..5f98274573 100644 --- a/packages/page-parachains/src/Overview/Parachain.tsx +++ b/packages/page-parachains/src/Overview/Parachain.tsx @@ -22,7 +22,7 @@ interface Props { lastInclusion?: [string, string]; } -type QueryResult = [Option, Option, Vec, Vec, Vec, Vec]; +type QueryResult = [Option, Option, Vec, Vec, Vec, Vec, Option]; interface QueryState { headHex: string | null; @@ -31,6 +31,7 @@ interface QueryState { qUmp: number; qHrmpE: number; qHrmpI: number; + watermark: BlockNumber | null; } const transformLast = { @@ -44,9 +45,10 @@ const transformMulti = { qHrmpE: 0, qHrmpI: 0, qUmp: 0, - updateAt: null + updateAt: null, + watermark: null }, - transform: ([headData, optUp, dmp, ump, hrmpE, hrmpI]: QueryResult): QueryState => ({ + transform: ([headData, optUp, dmp, ump, hrmpE, hrmpI, optWm]: QueryResult): QueryState => ({ headHex: headData.isSome ? sliceHex(headData.unwrap(), 18) : null, @@ -54,7 +56,8 @@ const transformMulti = { qHrmpE: hrmpE.length, qHrmpI: hrmpI.length, qUmp: ump.length, - updateAt: optUp.unwrapOr(null) + updateAt: optUp.unwrapOr(null), + watermark: optWm.unwrapOr(null) }) }; @@ -80,12 +83,19 @@ function Parachain ({ bestNumber, className = '', id, lastInclusion }: Props): R [api.query.dmp.downwardMessageQueues, id], [api.query.ump.relayDispatchQueues, id], [api.query.hrmp.hrmpEgressChannelsIndex, id], - [api.query.hrmp.hrmpIngressChannelsIndex, id] + [api.query.hrmp.hrmpIngressChannelsIndex, id], + [api.query.hrmp.hrmpWatermarks, id] ], transformMulti) as QueryState; // we have a default value, cast is safe const blockDelay = useMemo( - () => lastRelayNumber && bestNumber && bestNumber.sub(lastRelayNumber).subn(1), - [bestNumber, lastRelayNumber] + () => bestNumber && ( + lastRelayNumber + ? bestNumber.sub(lastRelayNumber).subn(1) + : paraInfo.watermark + ? bestNumber.sub(paraInfo.watermark) + : undefined + ), + [bestNumber, lastRelayNumber, paraInfo] ); const chainLink = useMemo( @@ -100,9 +110,9 @@ function Parachain ({ bestNumber, className = '', id, lastInclusion }: Props): R {paraInfo.headHex} {blockDelay && } - {lastInclusion && lastRelayNumber && ( - {formatNumber(lastRelayNumber)} - ) + {lastInclusion && lastRelayNumber + ? {formatNumber(lastRelayNumber)} + : paraInfo.watermark && formatNumber(paraInfo.watermark) } {paraBest && <>{formatNumber(paraBest)}}