This repository has been archived by the owner on Feb 27, 2021. It is now read-only.
fix: add miner stats pagination by block range #232
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
|
|
||
| import React from "react"; | ||
| import { Grid, IconButton, Typography } from "@material-ui/core"; | ||
| import { ArrowForwardIos, ArrowBackIos } from "@material-ui/icons"; | ||
|
|
||
| interface IProps { | ||
| from: number; | ||
| to: number; | ||
| disableNext?: boolean; | ||
| disablePrev?: boolean; | ||
| onNext?: () => void; | ||
| onPrev?: () => void; | ||
| style?: any; | ||
| } | ||
|
|
||
| const BlockPagination: React.FC<IProps> = (props) => { | ||
|
|
||
| return ( | ||
| <Grid container> | ||
| <Grid container justify="flex-end"> | ||
| <IconButton onClick={props.onPrev} disabled={props.disablePrev}> | ||
| <ArrowBackIos /> | ||
| </IconButton> | ||
| <IconButton onClick={props.onNext} disabled={props.disableNext}> | ||
| <ArrowForwardIos /> | ||
| </IconButton> | ||
| </Grid> | ||
| <Grid container justify="flex-end"> | ||
| <Typography>Showing {(props.to - props.from) + 1} Block Range: <b>{props.to}</b> - {props.from}</Typography> | ||
| </Grid> | ||
| </Grid> | ||
| ); | ||
| }; | ||
|
|
||
| export default BlockPagination; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| import BlockPagination from "./BlockPagination"; | ||
| export default BlockPagination; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| import React from "react"; | ||
| import BigNumber from "bignumber.js"; | ||
| import { hashesToGH } from "../formatters"; | ||
| import { hexToNumber } from "@etclabscore/eserialize"; | ||
| import { Grid } from "@material-ui/core"; | ||
| import ChartCard from "../ChartCard"; | ||
| import { VictoryLine, VictoryBar, VictoryChart } from "victory"; | ||
| import { useTranslation } from "react-i18next"; | ||
|
|
||
| const config = { | ||
| blockTime: 15, // seconds | ||
| blockHistoryLength: 100, | ||
| chartHeight: 200, | ||
| chartWidth: 400, | ||
| }; | ||
|
|
||
| const blockMapGasUsed = (block: any) => { | ||
| return { | ||
| x: hexToNumber(block.number), | ||
| y: new BigNumber(block.gasUsed).dividedBy(1000000), | ||
| }; | ||
| }; | ||
|
|
||
| const blockMapUncles = (block: any) => { | ||
| return { | ||
| x: hexToNumber(block.number), | ||
| y: block.uncles.length, | ||
| }; | ||
| }; | ||
|
|
||
| const blockMapHashRate = (block: any) => { | ||
| return { | ||
| x: hexToNumber(block.number), | ||
| y: hashesToGH(new BigNumber(block.difficulty, 16).dividedBy(config.blockTime)), | ||
|
There was a problem hiding this comment. Mmmm.. Using a hardcoded block time is a liiiitleee stretchy? There was a problem hiding this comment. yea would be nice to calculate the block time for the list of blocks you are looking at. maybe a helper |
||
| }; | ||
| }; | ||
|
|
||
| const blockMapTransactionCount = (block: any) => { | ||
| return { | ||
| x: hexToNumber(block.number), | ||
| y: block.transactions.length, | ||
| }; | ||
| }; | ||
|
|
||
| interface IProps { | ||
| blocks: any[]; | ||
| victoryTheme?: any; | ||
| } | ||
|
|
||
| const StatCharts: React.FC<IProps> = ({ blocks, victoryTheme }) => { | ||
| const { t } = useTranslation(); | ||
| return ( | ||
| <Grid item container> | ||
| <Grid key="hashChart" item xs={12} md={6} lg={3}> | ||
| <ChartCard title={t("Hash Rate")}> | ||
| <VictoryChart height={config.chartHeight} width={config.chartWidth} theme={victoryTheme as any}> | ||
| <VictoryLine data={blocks.map(blockMapHashRate)} /> | ||
| </VictoryChart> | ||
| </ChartCard> | ||
| </Grid> | ||
| <Grid key="txChart" item xs={12} md={6} lg={3}> | ||
| <ChartCard title={t("Transaction count")}> | ||
| <VictoryChart height={config.chartHeight} width={config.chartWidth} theme={victoryTheme as any}> | ||
| <VictoryBar data={blocks.map(blockMapTransactionCount)} /> | ||
| </VictoryChart> | ||
| </ChartCard> | ||
| </Grid> | ||
| <Grid key="gasUsed" item xs={12} md={6} lg={3}> | ||
| <ChartCard title={t("Gas Used")}> | ||
| <VictoryChart height={config.chartHeight} width={config.chartWidth} theme={victoryTheme as any}> | ||
| <VictoryBar data={blocks.map(blockMapGasUsed)} /> | ||
| </VictoryChart> | ||
| </ChartCard> | ||
| </Grid> | ||
| <Grid key="uncles" item xs={12} md={6} lg={3}> | ||
| <ChartCard title={t("Uncles")}> | ||
| <VictoryChart height={config.chartHeight} width={config.chartWidth} theme={victoryTheme as any}> | ||
| <VictoryBar data={blocks.map(blockMapUncles)} /> | ||
| </VictoryChart> | ||
| </ChartCard> | ||
| </Grid> | ||
| </Grid> | ||
| ); | ||
| }; | ||
|
|
||
| export default StatCharts; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| import StatCharts from "./StatCharts"; | ||
| export default StatCharts; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will this work if there are other parameters in the search pattern of the URI?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it does for certain keys, see here: https://github.com/etclabscore/expedition/blob/master/src/App.tsx#L38
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gotcha, thanks. Maybe the supported params should be parts of a config object and standardized/globalized then too, toward fewer magic strings.
Would suggest new ticket for it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
... Or modify the handrolled
Historylogic to use either a library (there must be one...?) and/or/thereby support arbitrary URI path/parameter/hash updates. So that this feature itself becomes some background "just works" magic.