diff --git a/hydra-explorer/json-schemas/hydra-explorer-api.yaml b/hydra-explorer/json-schemas/hydra-explorer-api.yaml index 57f84b6ed4a..bbc350e18bf 100644 --- a/hydra-explorer/json-schemas/hydra-explorer-api.yaml +++ b/hydra-explorer/json-schemas/hydra-explorer-api.yaml @@ -222,8 +222,8 @@ components: required: - headId - status - - lastUpdatedAtPoint - - lastUpdatedAtBlockNo + - point + - blockNo properties: headId: $ref: '#/components/schemas/HeadId' @@ -246,7 +246,7 @@ components: $ref: '#/components/schemas/SnapshotNumber' contestationDeadline: $ref: '#/components/schemas/UTCTime' - lastUpdatedAtPoint: + point: $ref: '#/components/schemas/ChainPoint' - lastUpdatedAtBlockNo: + blockNo: type: integer diff --git a/hydra-explorer/src/Hydra/Explorer/ExplorerState.hs b/hydra-explorer/src/Hydra/Explorer/ExplorerState.hs index a3ee6eb5ecc..40ad46b430e 100644 --- a/hydra-explorer/src/Hydra/Explorer/ExplorerState.hs +++ b/hydra-explorer/src/Hydra/Explorer/ExplorerState.hs @@ -69,8 +69,8 @@ data HeadState = HeadState , contestations :: Observed Natural , snapshotNumber :: Observed Natural , contestationDeadline :: Observed UTCTime - , lastUpdatedAtPoint :: ChainPoint - , lastUpdatedAtBlockNo :: BlockNo + , point :: ChainPoint + , blockNo :: BlockNo } deriving stock (Eq, Show, Generic) deriving anyclass (FromJSON, ToJSON) @@ -123,8 +123,8 @@ aggregateInitObservation headId point blockNo headSeed HeadParameters{parties, c , contestations = Seen 0 , snapshotNumber = Seen 0 , contestationDeadline = Unknown - , lastUpdatedAtPoint = point - , lastUpdatedAtBlockNo = blockNo + , point = point + , blockNo = blockNo } aggregateAbortObservation :: HeadId -> ChainPoint -> BlockNo -> [HeadState] -> [HeadState] @@ -145,8 +145,8 @@ aggregateAbortObservation headId point blockNo currentHeads = , contestations = Seen 0 , snapshotNumber = Seen 0 , contestationDeadline = Unknown - , lastUpdatedAtPoint = point - , lastUpdatedAtBlockNo = blockNo + , point = point + , blockNo = blockNo } aggregateCommitObservation :: HeadId -> ChainPoint -> BlockNo -> Party -> UTxO -> [HeadState] -> [HeadState] @@ -196,8 +196,8 @@ aggregateCommitObservation headId point blockNo party committed currentHeads = , contestations = Seen 0 , snapshotNumber = Seen 0 , contestationDeadline = Unknown - , lastUpdatedAtPoint = point - , lastUpdatedAtBlockNo = blockNo + , point = point + , blockNo = blockNo } aggregateCollectComObservation :: HeadId -> ChainPoint -> BlockNo -> [HeadState] -> [HeadState] @@ -218,8 +218,8 @@ aggregateCollectComObservation headId point blockNo currentHeads = , contestations = Seen 0 , snapshotNumber = Seen 0 , contestationDeadline = Unknown - , lastUpdatedAtPoint = point - , lastUpdatedAtBlockNo = blockNo + , point = point + , blockNo = blockNo } aggregateCloseObservation :: HeadId -> ChainPoint -> BlockNo -> SnapshotNumber -> UTCTime -> [HeadState] -> [HeadState] @@ -240,8 +240,8 @@ aggregateCloseObservation headId point blockNo (UnsafeSnapshotNumber sn) contest , contestations = Seen 0 , snapshotNumber = Seen sn , contestationDeadline = Seen contestationDeadline - , lastUpdatedAtPoint = point - , lastUpdatedAtBlockNo = blockNo + , point = point + , blockNo = blockNo } aggregateContestObservation :: HeadId -> ChainPoint -> BlockNo -> SnapshotNumber -> [HeadState] -> [HeadState] @@ -270,8 +270,8 @@ aggregateContestObservation headId point blockNo (UnsafeSnapshotNumber sn) curre , contestations = Seen 1 , snapshotNumber = Seen sn , contestationDeadline = Unknown - , lastUpdatedAtPoint = point - , lastUpdatedAtBlockNo = blockNo + , point = point + , blockNo = blockNo } aggregateFanoutObservation :: HeadId -> ChainPoint -> BlockNo -> [HeadState] -> [HeadState] @@ -292,8 +292,8 @@ aggregateFanoutObservation headId point blockNo currentHeads = , contestations = Unknown , snapshotNumber = Unknown , contestationDeadline = Unknown - , lastUpdatedAtPoint = point - , lastUpdatedAtBlockNo = blockNo + , point = point + , blockNo = blockNo } replaceHeadState :: HeadState -> [HeadState] -> [HeadState] diff --git a/hydra-explorer/web/src/app/model.tsx b/hydra-explorer/web/src/app/model.tsx index 258bb4c9efc..bcce6a508ee 100644 --- a/hydra-explorer/web/src/app/model.tsx +++ b/hydra-explorer/web/src/app/model.tsx @@ -6,8 +6,8 @@ export interface ChainPoint { export interface HeadState { headId: string status: string - lastUpdatedAtPoint: ChainPoint - lastUpdatedAtBlockNo: number + point: ChainPoint + blockNo: number } export interface TickState { diff --git a/hydra-explorer/web/src/components/HeadsTable/index.tsx b/hydra-explorer/web/src/components/HeadsTable/index.tsx index eb7e71475df..2edba490f2c 100644 --- a/hydra-explorer/web/src/components/HeadsTable/index.tsx +++ b/hydra-explorer/web/src/components/HeadsTable/index.tsx @@ -5,7 +5,6 @@ import useDataFetcher from "@/hooks/DataFetcher" import { useState } from "react" const HeadsTable = () => { - const [heads, setHeads] = useState([]) const [error, setError] = useState(null) @@ -16,7 +15,7 @@ const HeadsTable = () => { }) return ( -
+
{error ? (

{error}

) : ( @@ -24,21 +23,21 @@ const HeadsTable = () => { - - - - - + + + + + {heads?.map((entry, index) => ( - - - - - + + + + + ))} diff --git a/hydra-explorer/web/src/components/IntervalSetter/index.tsx b/hydra-explorer/web/src/components/IntervalSetter/index.tsx index d4b031d4e61..c1145d3aa55 100644 --- a/hydra-explorer/web/src/components/IntervalSetter/index.tsx +++ b/hydra-explorer/web/src/components/IntervalSetter/index.tsx @@ -3,20 +3,16 @@ import { useIntervalContext } from "@/providers/IntervalProvider" import { ChangeEvent } from "react" -interface IntervalSetterProps { - className?: string -} - -export default function IntervalSetter(props: IntervalSetterProps) { +const IntervalSetter = () => { const { isAutoUpdate , intervalTime , toggleAutoUpdate , updateIntervalTime } = useIntervalContext() return ( -
- -
+
+
+ +
+
Head IDStatusLast Updated At SlotNoLast Updated At BlockNoLast Updated At BlockHashHead IDStatusSlot NumberBlock NumberBlock Hash
{entry.headId}{entry.status}{entry.lastUpdatedAtPoint.slot}{entry.lastUpdatedAtBlockNo}{entry.lastUpdatedAtPoint.blockHash}{entry.headId}{entry.status}{entry.point.slot}{entry.blockNo}{entry.point.blockHash}
- - - + + + {tick ? ( - - - + + + ) : null}
Block NumberBlock HashSlot NumberBlock NumberBlock HashSlot Number
{tick?.blockNo}{tick?.point.blockHash}{tick?.point.slot}{tick?.blockNo}{tick?.point.blockHash}{tick?.point.slot}