From 632cc2cfeb4f821d9ec24012a003b48632b23512 Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Fri, 1 Sep 2023 16:42:13 -0600 Subject: [PATCH 01/13] feat(webapp): add tooltip with helper text to the SimpleCardComponent --- webapp/src/components/NodesSummary/index.js | 13 ++- .../src/components/ProducersSummary/index.js | 1 + .../SimpleDataCard/MoreInfoTooltip.js | 36 +++++++ webapp/src/components/SimpleDataCard/index.js | 13 ++- .../src/components/SimpleDataCard/styles.js | 96 ++++++++++++------- .../TransactionsChartContainer/styles.js | 3 + .../components/TransactionsHistory/index.js | 20 ++-- webapp/src/language/en.json | 42 +++++++- webapp/src/language/es.json | 40 +++++++- webapp/src/routes/EVMDashboard/index.js | 8 ++ webapp/src/routes/Home/BlockProducerInfo.js | 4 + 11 files changed, 221 insertions(+), 55 deletions(-) create mode 100644 webapp/src/components/SimpleDataCard/MoreInfoTooltip.js diff --git a/webapp/src/components/NodesSummary/index.js b/webapp/src/components/NodesSummary/index.js index 641d14fc..cfb42cbe 100644 --- a/webapp/src/components/NodesSummary/index.js +++ b/webapp/src/components/NodesSummary/index.js @@ -5,7 +5,7 @@ import { useQuery } from '@apollo/client' import { useTranslation } from 'react-i18next' import { NODES_SUMMARY_QUERY } from '../../gql' -import { generalConfig } from '../../config' +import { eosConfig } from '../../config' import SimpleDataCard from '../SimpleDataCard' const NODES_ORDER = [ @@ -41,7 +41,7 @@ const NodesSummary = ({ t }) => { setTotal(total) - const nodesOrderByNet = generalConfig.historyEnabled + const nodesOrderByNet = eosConfig.networkName === 'lacchain' ? NODES_ORDER[0] : NODES_ORDER[1] const sortedNodes = Object.keys(nodes) @@ -73,6 +73,7 @@ const NodesSummary = ({ t }) => { <> @@ -80,6 +81,14 @@ const NodesSummary = ({ t }) => { nodes.map((node) => ( nodeType.name) + .includes(node.type) + ? t(`tooltip.${node.type}`) + : '' + } title={ currentLanguaje === 'es' ? t('nodes') + ' ' + t(node.type) diff --git a/webapp/src/components/ProducersSummary/index.js b/webapp/src/components/ProducersSummary/index.js index eef1d4d1..7325e1c2 100644 --- a/webapp/src/components/ProducersSummary/index.js +++ b/webapp/src/components/ProducersSummary/index.js @@ -34,6 +34,7 @@ const ProducersSummary = ({ t, data, loading, total }) => { <> diff --git a/webapp/src/components/SimpleDataCard/MoreInfoTooltip.js b/webapp/src/components/SimpleDataCard/MoreInfoTooltip.js new file mode 100644 index 00000000..8a983913 --- /dev/null +++ b/webapp/src/components/SimpleDataCard/MoreInfoTooltip.js @@ -0,0 +1,36 @@ +import React, { memo } from 'react' +import { makeStyles } from '@mui/styles' +import PropTypes from 'prop-types' +import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined' +import Tooltip from '@mui/material/Tooltip' + +import styles from './styles' + +const useStyles = makeStyles(styles) + +const MoreInfoTooltip = ({ helperText }) => { + const classes = useStyles() + + return ( + {helperText}} + placement="top" + arrow + enterTouchDelay={0} + disableFocusListener + classes={{ popper: classes.tooltipPopper }} + > + + + ) +} + +MoreInfoTooltip.propTypes = { + helperText: PropTypes.string, +} + +MoreInfoTooltip.defaultProps = { + helperText: '', +} + +export default memo(MoreInfoTooltip) diff --git a/webapp/src/components/SimpleDataCard/index.js b/webapp/src/components/SimpleDataCard/index.js index 1207b73a..0eaca3d0 100644 --- a/webapp/src/components/SimpleDataCard/index.js +++ b/webapp/src/components/SimpleDataCard/index.js @@ -3,10 +3,11 @@ import { makeStyles } from '@mui/styles' import PropTypes from 'prop-types' import Card from '@mui/material/Card' import CardContent from '@mui/material/CardContent' -import Typography from '@mui/material/Typography' import LinearProgress from '@mui/material/LinearProgress' +import Typography from '@mui/material/Typography' import styles from './styles' +import MoreInfoTooltip from './MoreInfoTooltip' const useStyles = makeStyles(styles) @@ -14,6 +15,7 @@ const SimpleDataCard = ({ header, lowercase, title, + helperText, value, loading, children, @@ -25,7 +27,12 @@ const SimpleDataCard = ({
- {title && {title}} + {title && ( +
+ {title} + {helperText && } +
+ )} {isNotLoading ? ( ({ - cards: { - textTransform: 'capitalize', - minHeight: '90px', - '& .MuiTypography-h6': { - display: 'flex', - justifyContent: 'center', - textAlign: 'center', - marginTop: theme.spacing(2), - }, + cards: { + textTransform: 'capitalize', + minHeight: '90px', + '& .MuiTypography-h6': { + display: 'flex', + justifyContent: 'center', + textAlign: 'center', + marginTop: theme.spacing(2), }, - cardShadow: { - boxShadow: '0px 1px 3px 1px rgba(0, 0, 0, 0.15) !important', + }, + cardShadow: { + boxShadow: '0px 1px 3px 1px rgba(0, 0, 0, 0.15) !important', + }, + cardHeader: { + flexGrow: '1', + flexBasis: 'calc(100%/5)', + [theme.breakpoints.down('md')]: { + marginBottom: '10px', }, - cardHeader: { - flexGrow: '1', - flexBasis: 'calc(100%/5)', - [theme.breakpoints.down('md')]: { - marginBottom: '10px', - }, - '& .MuiPaper-root': { - height: '100%', - }, + '& .MuiPaper-root': { + height: '100%', }, - cardGrow: { - flexGrow: '1', - flexBasis: 'calc(100%/5)', - [theme.breakpoints.down('md')]: { - flexBasis: 'calc(100%/3)', - marginBottom: '10px', - }, - '& .MuiPaper-root': { - height: '100%', - }, + }, + cardGrow: { + flexGrow: '1', + flexBasis: 'calc(100%/5)', + [theme.breakpoints.down('md')]: { + flexBasis: 'calc(100%/3)', + marginBottom: '10px', + }, + '& .MuiPaper-root': { + height: '100%', }, - lowercase: { - textTransform: 'lowercase !important', + }, + lowercase: { + textTransform: 'lowercase !important', + }, + svgLink: { + fontSize: 18, + marginLeft: theme.spacing(2), + }, + titleContainer: { + display: 'flex', + gap: theme.spacing(2), + '& svg': { + width: 20, + height: 20, + '&:hover': { + cursor: 'pointer', + color: theme.palette.primary.main, + }, }, - svgLink: { - fontSize: 18, - marginLeft: theme.spacing(2), + }, + tooltipPopper: { + padding: theme.spacing(1), + maxWidth: '150px', + textAlign: 'center', + '& .MuiTooltip-tooltip': { + paddingBottom: `${theme.spacing(2)} !important`, + fontSize: '1.1em !important', + fontWeight: 'normal !important', + lineHeight: '18px !important', + overflowWrap: 'break-word !important', }, - }) + }, +}) diff --git a/webapp/src/components/TransactionsChartContainer/styles.js b/webapp/src/components/TransactionsChartContainer/styles.js index 88c3f6a2..4501d77d 100644 --- a/webapp/src/components/TransactionsChartContainer/styles.js +++ b/webapp/src/components/TransactionsChartContainer/styles.js @@ -26,6 +26,9 @@ export default (theme) => ({ [theme.breakpoints.up('lg')]: { width: 300, }, + [theme.breakpoints.down('lg')]: { + marginTop: theme.spacing(3), + }, }, cardShadow: { boxShadow: '0px 1px 3px 1px rgba(0, 0, 0, 0.15) !important', diff --git a/webapp/src/components/TransactionsHistory/index.js b/webapp/src/components/TransactionsHistory/index.js index 26a18976..525ab2cd 100644 --- a/webapp/src/components/TransactionsHistory/index.js +++ b/webapp/src/components/TransactionsHistory/index.js @@ -26,6 +26,7 @@ const TransactionsHistory = ({ t, nodesChildren }) => { <> @@ -37,6 +38,7 @@ const TransactionsHistory = ({ t, nodesChildren }) => { @@ -48,6 +50,7 @@ const TransactionsHistory = ({ t, nodesChildren }) => { @@ -87,32 +90,32 @@ const TransactionsHistory = ({ t, nodesChildren }) => { loading={loading} /> @@ -123,6 +126,7 @@ const TransactionsHistory = ({ t, nodesChildren }) => { {nodesChildren} @@ -131,20 +135,24 @@ const TransactionsHistory = ({ t, nodesChildren }) => { {
@@ -138,6 +140,7 @@ const EVMDashboard = () => {
@@ -156,6 +159,7 @@ const EVMDashboard = () => { /> { /> { @@ -184,6 +190,7 @@ const EVMDashboard = () => { /> { /> diff --git a/webapp/src/routes/Home/BlockProducerInfo.js b/webapp/src/routes/Home/BlockProducerInfo.js index 0e6d5ac8..bc4f416d 100644 --- a/webapp/src/routes/Home/BlockProducerInfo.js +++ b/webapp/src/routes/Home/BlockProducerInfo.js @@ -93,16 +93,19 @@ const BlockProducerInfo = ({ t, classes }) => {
@@ -137,6 +140,7 @@ const BlockProducerInfo = ({ t, classes }) => { Date: Mon, 4 Sep 2023 13:48:53 -0600 Subject: [PATCH 02/13] feat(webapp): add tooltip to block producer schedule --- .../components/SimpleDataCard/MoreInfoTooltip.js | 1 + webapp/src/components/SimpleDataCard/styles.js | 14 +++++++------- webapp/src/language/en.json | 6 +----- webapp/src/language/es.json | 6 +----- webapp/src/routes/Home/BlockProducerInfo.js | 10 +++++++--- webapp/src/routes/Home/styles.js | 7 +++++++ 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/webapp/src/components/SimpleDataCard/MoreInfoTooltip.js b/webapp/src/components/SimpleDataCard/MoreInfoTooltip.js index 8a983913..33d6c00b 100644 --- a/webapp/src/components/SimpleDataCard/MoreInfoTooltip.js +++ b/webapp/src/components/SimpleDataCard/MoreInfoTooltip.js @@ -18,6 +18,7 @@ const MoreInfoTooltip = ({ helperText }) => { arrow enterTouchDelay={0} disableFocusListener + className={classes.tooltip} classes={{ popper: classes.tooltipPopper }} > diff --git a/webapp/src/components/SimpleDataCard/styles.js b/webapp/src/components/SimpleDataCard/styles.js index 3d0db093..7cb3919d 100644 --- a/webapp/src/components/SimpleDataCard/styles.js +++ b/webapp/src/components/SimpleDataCard/styles.js @@ -43,13 +43,13 @@ export default (theme) => ({ titleContainer: { display: 'flex', gap: theme.spacing(2), - '& svg': { - width: 20, - height: 20, - '&:hover': { - cursor: 'pointer', - color: theme.palette.primary.main, - }, + }, + tooltip: { + width: '20px !important', + height: '20px !important', + '&:hover': { + cursor: 'pointer', + color: theme.palette.primary.main, }, }, tooltipPopper: { diff --git a/webapp/src/language/en.json b/webapp/src/language/en.json index 94f057c5..afd0b3fb 100644 --- a/webapp/src/language/en.json +++ b/webapp/src/language/en.json @@ -165,14 +165,13 @@ "netUsage": "NET Usage", "average": "Average", "tooltip": { - "currentProducer": "", "headBlock": "The last pending block produced", "lastBlock": "The last confirmed block produced", + "bpSchedule": "Current top 21 block producers", "scheduleVersion": "Current iteration number of the top 21 block producer list", "tpsAllTimeHigh": "Maximum number of transactions per second (TPS)", "cpuUtilizationAllTimeHigh": "The CPU usage in the all time high TPS", "networkUtilizationAllTimeHigh": "The NET usage in the all time high TPS", - "nodes": "", "full": "Node that provides data since the first block", "seed": "Node that provides P2P endpoints to the public", "query": "Node that provides HTTP(S) API endpoints to the public", @@ -180,8 +179,6 @@ "uniqueLocations": "Amount of countries with block producers, calculated from bp.json objects", "cpuLimitPerBlock": "Maximum billable CPU in ms that a block can use", "netLimitPerBlock": "Maximum NET in KB that a block can use", - "chainCpuLimit": "", - "chainNetLimit": "", "timeToFinality": "The time it takes for the blockchain to confirm a transaction", "cpuUsage": "Current percentage of CPU used in the last second", "netUsage": "Current percentage of NET used in the last second", @@ -473,7 +470,6 @@ "transactions": "EVM transactions", "gasUsed": "Gas Used", "tooltip": { - "totalWallets": "", "avgBlockTime": "Average time a new block is generated", "gasPrice": "A fixed virtual fuel expressed in gigawei used to execute smart contracts", "avgGasUsage": "Average gas used in the last 100 blocks", diff --git a/webapp/src/language/es.json b/webapp/src/language/es.json index 839b0222..3f5f2164 100644 --- a/webapp/src/language/es.json +++ b/webapp/src/language/es.json @@ -165,14 +165,13 @@ "netUsage": "Uso de NET", "average": "Promedio", "tooltip": { - "currentProducer": "", "headBlock": "El último bloque pendiente producido", "lastBlock": "El último bloque confirmado producido", + "bpSchedule": "Top 21 Productores de bloques actuales", "scheduleVersion": "El número de iteración actual de la lista de top 21 productores de bloques", "tpsAllTimeHigh": "Máximo número de transacciones por segundo (TPS)", "cpuUtilizationAllTimeHigh": "El uso de CPU en el TPS máximo histórico", "networkUtilizationAllTimeHigh": "El uso de NET en el TPS máximo histórico", - "nodes": "", "full": "Nodo que provee datos desde el primer bloque", "seed": "Nodo que provee puntos finales P2P publicos", "query": "Nodo que provee puntos finales HTTP(S) API publicos", @@ -180,8 +179,6 @@ "uniqueLocations": "Cantidad de países con productores de bloques, calculado con los bp.json", "cpuLimitPerBlock": "Máximo CPU en ms que un bloque puede utilizar", "netLimitPerBlock": "Máximo NET en KB que un bloque puede utilizar", - "chainCpuLimit": "", - "chainNetLimit": "", "timeToFinality": "El tiempo que le toma a la cadena para confirmar una transacción", "cpuUsage": "Porcentaje actual de CPU usados en el último segundo", "netUsage": "Porcentaje actual de NET usados en el último segundo", @@ -492,7 +489,6 @@ "transactions": "Transacciones EVM", "gasUsed": "Gas Usado", "tooltip": { - "totalWallets": "", "avgBlockTime": "Tiempo promedio en que se genera un nuevo bloque", "gasPrice": "Un combustible virtual fijo expresado en gigaweis usado para ejecutar contratos inteligentes", "avgGasUsage": "Gas promedio utilizado en los últimos 100 bloques", diff --git a/webapp/src/routes/Home/BlockProducerInfo.js b/webapp/src/routes/Home/BlockProducerInfo.js index bc4f416d..f15109a3 100644 --- a/webapp/src/routes/Home/BlockProducerInfo.js +++ b/webapp/src/routes/Home/BlockProducerInfo.js @@ -20,6 +20,7 @@ const TransactionInfo = lazy(() => import('./TransactionInfo')) const NodesSummary = lazy(() => import('../../components/NodesSummary')) const ProducersSummary = lazy(() => import('../../components/ProducersSummary')) const SimpleDataCard = lazy(() => import('../../components/SimpleDataCard')) +const MoreInfoTooltip = lazy(() => import('../../components/SimpleDataCard/MoreInfoTooltip')) const BlockProducerInfo = ({ t, classes }) => { const { data: { loading, producers } = {} } = useQuery(PRODUCERS_QUERY) @@ -113,9 +114,12 @@ const BlockProducerInfo = ({ t, classes }) => {
- - {t('bpSchedule')} - +
+ + {t('bpSchedule')} + + +
diff --git a/webapp/src/routes/Home/styles.js b/webapp/src/routes/Home/styles.js index f37cc49a..36a2196d 100644 --- a/webapp/src/routes/Home/styles.js +++ b/webapp/src/routes/Home/styles.js @@ -29,4 +29,11 @@ export default (theme) => ({ marginBottom: '10px', }, }, + titleContainer: { + display: 'flex', + gap: theme.spacing(2), + [theme.breakpoints.down('md')]: { + marginBottom: theme.spacing(3), + }, + }, }) From e52e6f6f1bec671940dac010431487825c2db236 Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Mon, 4 Sep 2023 13:50:48 -0600 Subject: [PATCH 03/13] fix(webapp): fix accessibility errors --- webapp/src/components/Footer/index.js | 22 ++++++++++++------- .../src/components/InformationCard/styles.js | 4 ++++ .../src/components/NetworkSelector/index.js | 18 +++++++-------- .../src/components/NonCompliantCard/styles.js | 4 ++++ webapp/src/components/ProducersChart/index.js | 14 ++++++++++-- webapp/src/routes/NonCompliantBPs/styles.js | 2 ++ 6 files changed, 45 insertions(+), 19 deletions(-) diff --git a/webapp/src/components/Footer/index.js b/webapp/src/components/Footer/index.js index ca02fb3b..04aabed9 100644 --- a/webapp/src/components/Footer/index.js +++ b/webapp/src/components/Footer/index.js @@ -68,14 +68,20 @@ const Footer = () => { - - {t('bugRequest')} - + + + {t('bugRequest')} + + } + /> +
diff --git a/webapp/src/components/InformationCard/styles.js b/webapp/src/components/InformationCard/styles.js index 74ecb325..1051c17b 100644 --- a/webapp/src/components/InformationCard/styles.js +++ b/webapp/src/components/InformationCard/styles.js @@ -354,6 +354,10 @@ export default (theme) => ({ textAlign: 'center', color: '#3d3d3dde', }, + '& a': { + color: theme.palette.primary.main, + textDecorationColor: theme.palette.primary.main, + }, }, horizontalLine: { [theme.breakpoints.down('lg')]: { diff --git a/webapp/src/components/NetworkSelector/index.js b/webapp/src/components/NetworkSelector/index.js index 4e239405..c44ef8b0 100644 --- a/webapp/src/components/NetworkSelector/index.js +++ b/webapp/src/components/NetworkSelector/index.js @@ -25,35 +25,35 @@ const LogoSvg = ({ name }) => { switch (name) { case 'jungle': - return jungle + return jungle logo case 'telos': - return telos + return telos logo case 'wax': - return wax + return wax logo case 'lacchain': return ( - lacchain + lacchain logo ) case 'proton': - return proton + return proton logo case 'airwire': return ( - airwire + airwire logo ) case 'ultra': - return ultra + return ultra logo case 'libre': - return libre + return libre logo default: - return eos + return eos logo } } diff --git a/webapp/src/components/NonCompliantCard/styles.js b/webapp/src/components/NonCompliantCard/styles.js index f6775721..d62d66cb 100644 --- a/webapp/src/components/NonCompliantCard/styles.js +++ b/webapp/src/components/NonCompliantCard/styles.js @@ -33,6 +33,10 @@ export default (theme) => ({ height: 'auto', margin: '0px', flexGrow: '1', + '& a': { + color: theme.palette.primary.main, + textDecorationColor: theme.palette.primary.main, + }, [theme.breakpoints.down('lg')]: { width: '150px', }, diff --git a/webapp/src/components/ProducersChart/index.js b/webapp/src/components/ProducersChart/index.js index ba02b5b2..01b4003f 100644 --- a/webapp/src/components/ProducersChart/index.js +++ b/webapp/src/components/ProducersChart/index.js @@ -103,7 +103,12 @@ const CustomBarLabel = memo( } return ( - + ) @@ -124,7 +129,12 @@ const CustomBarLabel = memo( } return ( - + ) diff --git a/webapp/src/routes/NonCompliantBPs/styles.js b/webapp/src/routes/NonCompliantBPs/styles.js index b8588b15..7fe7f807 100644 --- a/webapp/src/routes/NonCompliantBPs/styles.js +++ b/webapp/src/routes/NonCompliantBPs/styles.js @@ -42,6 +42,7 @@ export default (theme) => ({ margin: '0px', flexGrow: '1', background: theme.palette.common.white, + borderRadius: theme.spacing(1), [theme.breakpoints.down('sm')]: { width: '200px', }, @@ -66,6 +67,7 @@ export default (theme) => ({ minHeight: '125px', padding: theme.spacing(2), background: theme.palette.common.white, + borderRadius: theme.spacing(1), '& .MuiTypography-h6': { display: 'flex', }, From b72a753a36bb911cafd72d36eca69c4812da58a3 Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Wed, 6 Sep 2023 11:45:50 -0600 Subject: [PATCH 04/13] refactor(webapp): use SimpleDataCard component for rewards stats cards and remove redudant texts --- webapp/src/components/SimpleDataCard/index.js | 26 ++++-- .../src/components/SimpleDataCard/styles.js | 22 +++-- .../components/TransactionsHistory/index.js | 6 +- webapp/src/language/en.json | 10 +- webapp/src/language/en.telos-testnet.json | 2 +- webapp/src/language/en.telos.json | 2 +- webapp/src/language/es.json | 10 +- webapp/src/language/es.telos-testnet.json | 2 +- webapp/src/language/es.telos.json | 2 +- webapp/src/routes/EVMDashboard/index.js | 1 - webapp/src/routes/Home/BlockProducerInfo.js | 1 - .../routes/NonCompliantBPs/RewardsStats.js | 93 ++++++++----------- webapp/src/routes/NonCompliantBPs/styles.js | 22 +---- 13 files changed, 88 insertions(+), 111 deletions(-) diff --git a/webapp/src/components/SimpleDataCard/index.js b/webapp/src/components/SimpleDataCard/index.js index 0eaca3d0..592e5b46 100644 --- a/webapp/src/components/SimpleDataCard/index.js +++ b/webapp/src/components/SimpleDataCard/index.js @@ -29,19 +29,27 @@ const SimpleDataCard = ({ {title && (
- {title} + + {title} + {helperText && }
)} {isNotLoading ? ( - - {value} - {children} - + value ? ( + + {value} + {children} + + ) : ( + <>{children} + ) ) : ( )} diff --git a/webapp/src/components/SimpleDataCard/styles.js b/webapp/src/components/SimpleDataCard/styles.js index 7cb3919d..204082b0 100644 --- a/webapp/src/components/SimpleDataCard/styles.js +++ b/webapp/src/components/SimpleDataCard/styles.js @@ -2,12 +2,7 @@ export default (theme) => ({ cards: { textTransform: 'capitalize', minHeight: '90px', - '& .MuiTypography-h6': { - display: 'flex', - justifyContent: 'center', - textAlign: 'center', - marginTop: theme.spacing(2), - }, + height: '100%', }, cardShadow: { boxShadow: '0px 1px 3px 1px rgba(0, 0, 0, 0.15) !important', @@ -36,6 +31,12 @@ export default (theme) => ({ lowercase: { textTransform: 'lowercase !important', }, + textValue: { + display: 'flex', + justifyContent: 'center', + textAlign: 'center', + marginTop: `${theme.spacing(2)} !important`, + }, svgLink: { fontSize: 18, marginLeft: theme.spacing(2), @@ -43,10 +44,15 @@ export default (theme) => ({ titleContainer: { display: 'flex', gap: theme.spacing(2), + justifyContent: 'space-between', + }, + title: { + fontWeight: 'bold !important', }, tooltip: { - width: '20px !important', - height: '20px !important', + width: '18px !important', + height: '18px !important', + color: '#3d3d3dde', '&:hover': { cursor: 'pointer', color: theme.palette.primary.main, diff --git a/webapp/src/components/TransactionsHistory/index.js b/webapp/src/components/TransactionsHistory/index.js index 525ab2cd..6296a1f9 100644 --- a/webapp/src/components/TransactionsHistory/index.js +++ b/webapp/src/components/TransactionsHistory/index.js @@ -136,23 +136,21 @@ const TransactionsHistory = ({ t, nodesChildren }) => { lowercase title={t('cpuUsage')} helperText={t('tooltip.cpuUsage')} - value={`${formatWithThousandSeparator(tps[0]?.cpu, 2)} %`} + value={`${formatWithThousandSeparator(tps[0]?.cpu || 0, 2)} %`} /> moreDescription": "A visualization of the distribution of blocks produced by the nodes in the network.", "/missed-blocks>moreDescription": "A list of scheduled, produced, and missed blocks by each account in the network.", "/evm>heading": "Telos EVM Dashboard", - "/evm>moreDescription": "Monitor Telos EVM statistics, such as transaction amount history, gas price and total wallets created.", + "/evm>moreDescription": "Monitor Telos EVM statistics (tEVM), such as transaction amount history, gas price and total wallets created.", "/evm-rpc-endpoints>moreDescription": "A list of Telos EVM endpoints, with their health status and latency in milliseconds." } } diff --git a/webapp/src/language/en.telos.json b/webapp/src/language/en.telos.json index f4bddb41..58648221 100644 --- a/webapp/src/language/en.telos.json +++ b/webapp/src/language/en.telos.json @@ -32,7 +32,7 @@ "/block-distribution>moreDescription": "A visualization of the distribution of blocks produced by the nodes in the network.", "/missed-blocks>moreDescription": "A list of scheduled, produced, and missed blocks by each account in the network.", "/evm>heading": "Telos EVM Dashboard", - "/evm>moreDescription": "Monitor Telos EVM statistics, such as transaction amount history, gas price and total wallets created.", + "/evm>moreDescription": "Monitor Telos EVM statistics (tEVM), such as transaction amount history, gas price and total wallets created.", "/evm-rpc-endpoints>moreDescription": "A list of Telos EVM endpoints, with their health status and latency in milliseconds." } } diff --git a/webapp/src/language/es.json b/webapp/src/language/es.json index 3f5f2164..51b74945 100644 --- a/webapp/src/language/es.json +++ b/webapp/src/language/es.json @@ -165,7 +165,6 @@ "netUsage": "Uso de NET", "average": "Promedio", "tooltip": { - "headBlock": "El último bloque pendiente producido", "lastBlock": "El último bloque confirmado producido", "bpSchedule": "Top 21 Productores de bloques actuales", "scheduleVersion": "El número de iteración actual de la lista de top 21 productores de bloques", @@ -176,16 +175,14 @@ "seed": "Nodo que provee puntos finales P2P publicos", "query": "Nodo que provee puntos finales HTTP(S) API publicos", "producer": "Nodo encargado de la produción de bloques", + "nodes": "Cantidad de nodos de los primeros 150 productores", "uniqueLocations": "Cantidad de países con productores de bloques, calculado con los bp.json", - "cpuLimitPerBlock": "Máximo CPU en ms que un bloque puede utilizar", - "netLimitPerBlock": "Máximo NET en KB que un bloque puede utilizar", "timeToFinality": "El tiempo que le toma a la cadena para confirmar una transacción", "cpuUsage": "Porcentaje actual de CPU usados en el último segundo", "netUsage": "Porcentaje actual de NET usados en el último segundo", "totalProducers": "Cantidad de productores de bloques registrados en la red, recuperados de la cuenta eosio" } }, - "blockProducersRoute": {}, "rewardsDistributionRoute": { "dailyRewards": "Recompensas Diarias Totales", "yearlyRewards": "Recompensas Anuales Totales", @@ -489,13 +486,12 @@ "transactions": "Transacciones EVM", "gasUsed": "Gas Usado", "tooltip": { - "avgBlockTime": "Tiempo promedio en que se genera un nuevo bloque", - "gasPrice": "Un combustible virtual fijo expresado en gigaweis usado para ejecutar contratos inteligentes", + "gasPrice": "Combustible virtual usado para ejecutar contratos inteligentes en EVM", "avgGasUsage": "Gas promedio utilizado en los últimos 100 bloques", "totalIncoming": "Cantidad de transacciones transfer hacia (ACCOUNT)", "totalOutgoing": "Cantidad de transacciones transfer desde (ACCOUNT)", "ATH": "Cantidad máxima registrada de transacciones por segundo (TPS)", - "lastBlock": "El Ethereum block height, el número de bloques confirmados", + "lastBlock": "Ethereum block height, el número de bloques confirmados", "totalTxs": "Cantidad de transacciones desde el primer bloque" } }, diff --git a/webapp/src/language/es.telos-testnet.json b/webapp/src/language/es.telos-testnet.json index 8e707870..4ce6a4b4 100644 --- a/webapp/src/language/es.telos-testnet.json +++ b/webapp/src/language/es.telos-testnet.json @@ -29,7 +29,7 @@ "/accounts>moreDescription": "Esta herramienta le ayuda a buscar información sobre cuentas y contratos de la red. Escriba el nombre de un contrato o cuenta en el espacio provisto para comenzar a buscar. Obtendrá los datos de las acciones del contrato, tablas de contrato, alcance, límites superior e inferior y límites.", "/block-distribution>moreDescription": "Una visualización de la distribución de bloques producida por los nodos de la red.", "/missed-blocks>moreDescription": "Una lista de bloques programados, producidos y perdidos por cada cuenta en la red.", - "/evm>moreDescription": "Supervise las estadísticas del Telos EVM, como el histórico de la cantidad de transacciones, el precio del gas y las wallets creadas totales.", + "/evm>moreDescription": "Supervise las estadísticas del Telos EVM (tEVM), como el histórico de la cantidad de transacciones, el precio del gas y las wallets creadas totales.", "/evm-rpc-endpoints>moreDescription": "Una lista de puntos finales de Telos EVM, con sus estado de salud y latencia en milisegundos." } } diff --git a/webapp/src/language/es.telos.json b/webapp/src/language/es.telos.json index fb302043..085c6ee1 100644 --- a/webapp/src/language/es.telos.json +++ b/webapp/src/language/es.telos.json @@ -29,7 +29,7 @@ "/accounts>moreDescription": "Esta herramienta le ayuda a buscar información sobre cuentas y contratos de la red. Escriba el nombre de un contrato o cuenta en el espacio provisto para comenzar a buscar. Obtendrá los datos de las acciones del contrato, tablas de contrato, alcance, límites superior e inferior y límites.", "/block-distribution>moreDescription": "Una visualización de la distribución de bloques producida por los nodos de la red.", "/missed-blocks>moreDescription": "Una lista de bloques programados, producidos y perdidos por cada cuenta en la red.", - "/evm>moreDescription": "Supervise las estadísticas del Telos EVM, como el histórico de la cantidad de transacciones, el precio del gas y las wallets creadas totales.", + "/evm>moreDescription": "Supervise las estadísticas del Telos EVM (tEVM), como el histórico de la cantidad de transacciones, el precio del gas y las wallets creadas totales.", "/evm-rpc-endpoints>moreDescription": "Una lista de puntos finales de Telos EVM, con sus estado de salud y latencia en milisegundos." } } diff --git a/webapp/src/routes/EVMDashboard/index.js b/webapp/src/routes/EVMDashboard/index.js index 8a8b856b..38411cb3 100644 --- a/webapp/src/routes/EVMDashboard/index.js +++ b/webapp/src/routes/EVMDashboard/index.js @@ -176,7 +176,6 @@ const EVMDashboard = () => { diff --git a/webapp/src/routes/Home/BlockProducerInfo.js b/webapp/src/routes/Home/BlockProducerInfo.js index f15109a3..3e760e17 100644 --- a/webapp/src/routes/Home/BlockProducerInfo.js +++ b/webapp/src/routes/Home/BlockProducerInfo.js @@ -100,7 +100,6 @@ const BlockProducerInfo = ({ t, classes }) => { { return ( <> -
-
- {t('paidProducers')} -
- - {stats.quantity || 0} - -
+ +
+ + {stats.quantity || 0} +
-
-
-
- {t('dailyRewards')} -
- - {`${formatWithThousandSeparator(stats.dailyRewards, 0)} ${ - eosConfig.tokenSymbol - }`} - - - {`$${formatWithThousandSeparator( - stats.dailyRewards * stats.tokenPrice, - 0, - )} USD`} - -
+ + +
+ + {`${formatWithThousandSeparator(stats.dailyRewards, 0)} ${ + eosConfig.tokenSymbol + }`} + + + {`$${formatWithThousandSeparator( + stats.dailyRewards * stats.tokenPrice, + 0, + )} USD`} +
-
-
-
- {t('yearlyRewards')} -
- - {`${formatWithThousandSeparator(stats.yearlyRewards, 0)} ${ - eosConfig.tokenSymbol - }`} - - - {`$${formatWithThousandSeparator( - stats.yearlyRewards * stats.tokenPrice, - 0, - )} USD`} - -
+ + +
+ + {`${formatWithThousandSeparator(stats.yearlyRewards, 0)} ${ + eosConfig.tokenSymbol + }`} + + + {`$${formatWithThousandSeparator( + stats.yearlyRewards * stats.tokenPrice, + 0, + )} USD`} +
-
-
-
- {t('rewardsPercentage')} -
- - {`${stats.percentageRewards?.toFixed(2)}%`} - -
+ + +
+ + {`${stats.percentageRewards?.toFixed(2)}%`} +
-
+ ) } diff --git a/webapp/src/routes/NonCompliantBPs/styles.js b/webapp/src/routes/NonCompliantBPs/styles.js index 7fe7f807..d62e85f8 100644 --- a/webapp/src/routes/NonCompliantBPs/styles.js +++ b/webapp/src/routes/NonCompliantBPs/styles.js @@ -20,14 +20,7 @@ export default (theme) => ({ }, [theme.breakpoints.down('sm')]: { flexFlow: 'row wrap', - }, - }, - rewardsCards: { - height: '100%', - minHeight: '125px', - padding: theme.spacing(4), - '& h2': { - fontWeight: 'bold', + gap: theme.spacing(2), }, }, verticallyCenter: { @@ -35,17 +28,10 @@ export default (theme) => ({ display: 'flex', flexDirection: 'column', justifyContent: 'center', - }, - cardHeader: { - width: '100px', - height: 'auto', - margin: '0px', - flexGrow: '1', - background: theme.palette.common.white, - borderRadius: theme.spacing(1), [theme.breakpoints.down('sm')]: { - width: '200px', - }, + minWidth: '150px', + minHeight: '55px', + } }, bpsContainer: { display: 'grid', From ddddd2b39811c63bf34f1d240cd94cf3f7bf918a Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Thu, 7 Sep 2023 10:33:52 -0600 Subject: [PATCH 05/13] feat(webapp): open the tooltip when the user hovers over the card --- .../SimpleDataCard/MoreInfoTooltip.js | 14 ++++++++- webapp/src/components/SimpleDataCard/index.js | 29 +++++++++++++++++-- .../src/components/SimpleDataCard/styles.js | 9 ++++++ 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/webapp/src/components/SimpleDataCard/MoreInfoTooltip.js b/webapp/src/components/SimpleDataCard/MoreInfoTooltip.js index 33d6c00b..1fb39633 100644 --- a/webapp/src/components/SimpleDataCard/MoreInfoTooltip.js +++ b/webapp/src/components/SimpleDataCard/MoreInfoTooltip.js @@ -8,11 +8,19 @@ import styles from './styles' const useStyles = makeStyles(styles) -const MoreInfoTooltip = ({ helperText }) => { +const MoreInfoTooltip = ({ + helperText, + open, + handleOpenTooltip, + handleCloseTooltip, +}) => { const classes = useStyles() return ( {helperText}
} placement="top" arrow @@ -28,10 +36,14 @@ const MoreInfoTooltip = ({ helperText }) => { MoreInfoTooltip.propTypes = { helperText: PropTypes.string, + open: PropTypes.bool, + handleOpenTooltip: PropTypes.func, + handleCloseTooltip: PropTypes.func, } MoreInfoTooltip.defaultProps = { helperText: '', + open: false, } export default memo(MoreInfoTooltip) diff --git a/webapp/src/components/SimpleDataCard/index.js b/webapp/src/components/SimpleDataCard/index.js index 592e5b46..b2a3cef8 100644 --- a/webapp/src/components/SimpleDataCard/index.js +++ b/webapp/src/components/SimpleDataCard/index.js @@ -1,4 +1,4 @@ -import React, { memo } from 'react' +import React, { memo, useState } from 'react' import { makeStyles } from '@mui/styles' import PropTypes from 'prop-types' import Card from '@mui/material/Card' @@ -22,17 +22,40 @@ const SimpleDataCard = ({ }) => { const classes = useStyles() const isNotLoading = !loading || !!value?.toString() + const [open, setOpen] = useState(false) + + const handleOpenTooltip = () => { + setOpen(true) + } + + const handleCloseTooltip = () => { + setOpen(false) + } return (
- + {title && (
{title} - {helperText && } + {helperText && ( + + )}
)} {isNotLoading ? ( diff --git a/webapp/src/components/SimpleDataCard/styles.js b/webapp/src/components/SimpleDataCard/styles.js index 204082b0..eac3b5af 100644 --- a/webapp/src/components/SimpleDataCard/styles.js +++ b/webapp/src/components/SimpleDataCard/styles.js @@ -49,6 +49,15 @@ export default (theme) => ({ title: { fontWeight: 'bold !important', }, + tooltipHover: { + '&:hover': { + border: `0.5px solid ${theme.palette.primary.main}`, + '& svg': { + cursor: 'pointer', + color: theme.palette.primary.main, + } + }, + }, tooltip: { width: '18px !important', height: '18px !important', From cfc7f51ac8862424bca8a90902a6ad9a49f3c63c Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Thu, 7 Sep 2023 13:09:36 -0600 Subject: [PATCH 06/13] refactor(webapp): rename component and use custom hook to tooltip state --- .../components/SimpleDataCard/CardTooltip.js | 42 +++++++++++++++++++ webapp/src/components/SimpleDataCard/index.js | 24 ++++------- .../src/components/SimpleDataCard/styles.js | 6 +++ .../hooks/customHooks/useOpenModalState.js | 17 ++++++++ webapp/src/language/en.json | 7 ++-- webapp/src/language/es.json | 7 ++-- webapp/src/routes/Home/BlockProducerInfo.js | 7 ++-- webapp/src/routes/Home/styles.js | 7 ---- 8 files changed, 85 insertions(+), 32 deletions(-) create mode 100644 webapp/src/components/SimpleDataCard/CardTooltip.js create mode 100644 webapp/src/hooks/customHooks/useOpenModalState.js diff --git a/webapp/src/components/SimpleDataCard/CardTooltip.js b/webapp/src/components/SimpleDataCard/CardTooltip.js new file mode 100644 index 00000000..64f5237d --- /dev/null +++ b/webapp/src/components/SimpleDataCard/CardTooltip.js @@ -0,0 +1,42 @@ +import React, { memo } from 'react' +import { makeStyles } from '@mui/styles' +import PropTypes from 'prop-types' + +import styles from './styles' +import MoreInfoTooltip from './MoreInfoTooltip' +import useOpenModalState from 'hooks/customHooks/useOpenModalState' + +const useStyles = makeStyles(styles) + +const CardTooltip = ({ helperText, children }) => { + const classes = useStyles() + const [{ open }, { handleOpen, handleClose }] = useOpenModalState() + + return ( +
+ {children} + +
+ ) +} + +CardTooltip.propTypes = { + helperText: PropTypes.string, + children: PropTypes.node, +} + +CardTooltip.defaultProps = { + helperText: '', +} + +export default memo(CardTooltip) diff --git a/webapp/src/components/SimpleDataCard/index.js b/webapp/src/components/SimpleDataCard/index.js index b2a3cef8..9c5af6f7 100644 --- a/webapp/src/components/SimpleDataCard/index.js +++ b/webapp/src/components/SimpleDataCard/index.js @@ -1,4 +1,4 @@ -import React, { memo, useState } from 'react' +import React, { memo } from 'react' import { makeStyles } from '@mui/styles' import PropTypes from 'prop-types' import Card from '@mui/material/Card' @@ -6,6 +6,8 @@ import CardContent from '@mui/material/CardContent' import LinearProgress from '@mui/material/LinearProgress' import Typography from '@mui/material/Typography' +import useOpenModalState from 'hooks/customHooks/useOpenModalState' + import styles from './styles' import MoreInfoTooltip from './MoreInfoTooltip' @@ -22,22 +24,14 @@ const SimpleDataCard = ({ }) => { const classes = useStyles() const isNotLoading = !loading || !!value?.toString() - const [open, setOpen] = useState(false) - - const handleOpenTooltip = () => { - setOpen(true) - } - - const handleCloseTooltip = () => { - setOpen(false) - } + const [{ open }, { handleOpen, handleClose }] = useOpenModalState() return (
)}
diff --git a/webapp/src/components/SimpleDataCard/styles.js b/webapp/src/components/SimpleDataCard/styles.js index eac3b5af..2afa13ed 100644 --- a/webapp/src/components/SimpleDataCard/styles.js +++ b/webapp/src/components/SimpleDataCard/styles.js @@ -45,6 +45,12 @@ export default (theme) => ({ display: 'flex', gap: theme.spacing(2), justifyContent: 'space-between', + '&:hover': { + '& svg': { + cursor: 'pointer', + color: theme.palette.primary.main, + } + } }, title: { fontWeight: 'bold !important', diff --git a/webapp/src/hooks/customHooks/useOpenModalState.js b/webapp/src/hooks/customHooks/useOpenModalState.js new file mode 100644 index 00000000..bd37ac96 --- /dev/null +++ b/webapp/src/hooks/customHooks/useOpenModalState.js @@ -0,0 +1,17 @@ +import { useState } from 'react' + +const useOpenModalState = () => { + const [open, setOpen] = useState(false) + + const handleOpen = () => { + setOpen(true) + } + + const handleClose = () => { + setOpen(false) + } + + return [{ open }, { handleOpen, handleClose }] +} + +export default useOpenModalState diff --git a/webapp/src/language/en.json b/webapp/src/language/en.json index e76c59e7..b4eb8700 100644 --- a/webapp/src/language/en.json +++ b/webapp/src/language/en.json @@ -176,11 +176,11 @@ "query": "Node that provides HTTP(S) API endpoints to the public", "producer": "Node in charge of block production", "nodes": "Amount of nodes of the first 150 producers", - "uniqueLocations": "Amount of countries with block producers, calculated from bp.json objects", + "uniqueLocations": "Amount of countries with block producers, calculated from bp.jsons", "timeToFinality": "The time it takes for the blockchain to confirm a transaction", "cpuUsage": "Current percentage of CPU used in the last second", "netUsage": "Current percentage of NET used in the last second", - "totalProducers": "Amount of block producers registered in the network, obtained directly from the eosio contract" + "totalProducers": "Block Producers registered, obtained from the eosio contract" } }, "rewardsDistributionRoute": { @@ -481,6 +481,7 @@ "rpcEndpoint": "RPC Endpoint", "latency": "Latency", "lastBlock": "Last block", - "rerun": "Re-run health checks" + "rerun": "Re-run health checks", + "filterEndpoints": "Filter responding endpoints" } } diff --git a/webapp/src/language/es.json b/webapp/src/language/es.json index 51b74945..995de766 100644 --- a/webapp/src/language/es.json +++ b/webapp/src/language/es.json @@ -176,11 +176,11 @@ "query": "Nodo que provee puntos finales HTTP(S) API publicos", "producer": "Nodo encargado de la produción de bloques", "nodes": "Cantidad de nodos de los primeros 150 productores", - "uniqueLocations": "Cantidad de países con productores de bloques, calculado con los bp.json", + "uniqueLocations": "Cantidad de países con productores, calculada con los bp.json", "timeToFinality": "El tiempo que le toma a la cadena para confirmar una transacción", "cpuUsage": "Porcentaje actual de CPU usados en el último segundo", "netUsage": "Porcentaje actual de NET usados en el último segundo", - "totalProducers": "Cantidad de productores de bloques registrados en la red, recuperados de la cuenta eosio" + "totalProducers": "Productores de bloques registrados, recuperados del contrato eosio" } }, "rewardsDistributionRoute": { @@ -500,6 +500,7 @@ "rpcEndpoint": "Punto final RPC", "latency": "Latencia", "lastBlock": "Último bloque", - "rerun": "Reejecutar las pruebas" + "rerun": "Reejecutar las pruebas", + "filterEndpoints": "Filtrar puntos finales" } } diff --git a/webapp/src/routes/Home/BlockProducerInfo.js b/webapp/src/routes/Home/BlockProducerInfo.js index 3e760e17..9f947d26 100644 --- a/webapp/src/routes/Home/BlockProducerInfo.js +++ b/webapp/src/routes/Home/BlockProducerInfo.js @@ -20,7 +20,7 @@ const TransactionInfo = lazy(() => import('./TransactionInfo')) const NodesSummary = lazy(() => import('../../components/NodesSummary')) const ProducersSummary = lazy(() => import('../../components/ProducersSummary')) const SimpleDataCard = lazy(() => import('../../components/SimpleDataCard')) -const MoreInfoTooltip = lazy(() => import('../../components/SimpleDataCard/MoreInfoTooltip')) +const CardTooltip = lazy(() => import('../../components/SimpleDataCard/CardTooltip')) const BlockProducerInfo = ({ t, classes }) => { const { data: { loading, producers } = {} } = useQuery(PRODUCERS_QUERY) @@ -113,12 +113,11 @@ const BlockProducerInfo = ({ t, classes }) => {
-
+ {t('bpSchedule')} - -
+
diff --git a/webapp/src/routes/Home/styles.js b/webapp/src/routes/Home/styles.js index 36a2196d..f37cc49a 100644 --- a/webapp/src/routes/Home/styles.js +++ b/webapp/src/routes/Home/styles.js @@ -29,11 +29,4 @@ export default (theme) => ({ marginBottom: '10px', }, }, - titleContainer: { - display: 'flex', - gap: theme.spacing(2), - [theme.breakpoints.down('md')]: { - marginBottom: theme.spacing(3), - }, - }, }) From 0fa40c08670e42a8c5d06583b9f7060aec60373f Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Thu, 7 Sep 2023 13:56:06 -0600 Subject: [PATCH 07/13] chore(webapp): add simple hover effect in the card --- webapp/src/components/SimpleDataCard/index.js | 2 +- webapp/src/components/SimpleDataCard/styles.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/webapp/src/components/SimpleDataCard/index.js b/webapp/src/components/SimpleDataCard/index.js index 9c5af6f7..b7ff96f1 100644 --- a/webapp/src/components/SimpleDataCard/index.js +++ b/webapp/src/components/SimpleDataCard/index.js @@ -32,7 +32,7 @@ const SimpleDataCard = ({ onMouseOver={helperText ? handleOpen : null} onMouseMove={helperText ? handleOpen : null} onMouseOut={helperText ? handleClose : null} - className={`${classes.cardShadow} ${ + className={`${classes.cardShadow} ${classes.border} ${ helperText ? classes.tooltipHover : '' }`} > diff --git a/webapp/src/components/SimpleDataCard/styles.js b/webapp/src/components/SimpleDataCard/styles.js index 2afa13ed..1fe7acf4 100644 --- a/webapp/src/components/SimpleDataCard/styles.js +++ b/webapp/src/components/SimpleDataCard/styles.js @@ -7,6 +7,9 @@ export default (theme) => ({ cardShadow: { boxShadow: '0px 1px 3px 1px rgba(0, 0, 0, 0.15) !important', }, + border: { + border: '0.5px solid transparent', + }, cardHeader: { flexGrow: '1', flexBasis: 'calc(100%/5)', @@ -58,6 +61,7 @@ export default (theme) => ({ tooltipHover: { '&:hover': { border: `0.5px solid ${theme.palette.primary.main}`, + boxShadow: '0px 0px 40px -30px #1565c0bf inset !important', '& svg': { cursor: 'pointer', color: theme.palette.primary.main, From ec32f7e5ef4e7210eb8ca35271702a8bef30389b Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Thu, 7 Sep 2023 14:53:33 -0600 Subject: [PATCH 08/13] chore(hapi): improve sum of the types of the nodes --- hapi/src/services/stats.service.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hapi/src/services/stats.service.js b/hapi/src/services/stats.service.js index 7405b244..440392f1 100644 --- a/hapi/src/services/stats.service.js +++ b/hapi/src/services/stats.service.js @@ -69,8 +69,16 @@ const getNodesSummary = async () => { type `) - rows.forEach((row) => { - payload[row.node_type || 'unknown'] = row.nodes_count + rows.forEach(row => { + const nodeType = row.node_type || 'unknown' + row.node_type.sort() + + if (payload[nodeType]) { + payload[nodeType] += row.nodes_count + } else { + payload[nodeType] = row.nodes_count + } + total += row.nodes_count }) From bc84211190a77920783ab39e16878e99ea5391aa Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Thu, 7 Sep 2023 16:06:29 -0600 Subject: [PATCH 09/13] chore(hapi): change p2p to seed in nodes summary --- hapi/src/services/stats.service.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hapi/src/services/stats.service.js b/hapi/src/services/stats.service.js index 440392f1..a6aca9ba 100644 --- a/hapi/src/services/stats.service.js +++ b/hapi/src/services/stats.service.js @@ -71,7 +71,11 @@ const getNodesSummary = async () => { rows.forEach(row => { const nodeType = row.node_type || 'unknown' - row.node_type.sort() + + if (Array.isArray(nodeType)) { + nodeType = nodeType.map(type => (type === 'p2p' ? 'seed' : type)) + nodeType.sort() + } if (payload[nodeType]) { payload[nodeType] += row.nodes_count From e72abfaa74c3b2aa06bc3574288dbd53a3b2f1f5 Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Thu, 7 Sep 2023 16:07:50 -0600 Subject: [PATCH 10/13] chore(webapp): fix texts errors --- webapp/src/language/es.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/src/language/es.json b/webapp/src/language/es.json index 995de766..b0ba503a 100644 --- a/webapp/src/language/es.json +++ b/webapp/src/language/es.json @@ -169,12 +169,12 @@ "bpSchedule": "Top 21 Productores de bloques actuales", "scheduleVersion": "El número de iteración actual de la lista de top 21 productores de bloques", "tpsAllTimeHigh": "Máximo número de transacciones por segundo (TPS)", - "cpuUtilizationAllTimeHigh": "El uso de CPU en el TPS máximo histórico", - "networkUtilizationAllTimeHigh": "El uso de NET en el TPS máximo histórico", + "cpuUtilizationAllTimeHigh": "El uso de CPU en el TPS máximo", + "networkUtilizationAllTimeHigh": "El uso de NET en el TPS máximo", "full": "Nodo que provee datos desde el primer bloque", - "seed": "Nodo que provee puntos finales P2P publicos", - "query": "Nodo que provee puntos finales HTTP(S) API publicos", - "producer": "Nodo encargado de la produción de bloques", + "seed": "Nodo que provee puntos finales P2P públicos", + "query": "Nodo que provee puntos finales HTTP(S) API públicos", + "producer": "Nodo encargado de la producción de bloques", "nodes": "Cantidad de nodos de los primeros 150 productores", "uniqueLocations": "Cantidad de países con productores, calculada con los bp.json", "timeToFinality": "El tiempo que le toma a la cadena para confirmar una transacción", From 8ff23c328bde68f6cbfb376fc2682b1fce570faa Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Thu, 7 Sep 2023 16:29:18 -0600 Subject: [PATCH 11/13] fix(hapi): change nodeType to mutable --- hapi/src/services/stats.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hapi/src/services/stats.service.js b/hapi/src/services/stats.service.js index a6aca9ba..bd682b2a 100644 --- a/hapi/src/services/stats.service.js +++ b/hapi/src/services/stats.service.js @@ -70,7 +70,7 @@ const getNodesSummary = async () => { `) rows.forEach(row => { - const nodeType = row.node_type || 'unknown' + let nodeType = row.node_type || 'unknown' if (Array.isArray(nodeType)) { nodeType = nodeType.map(type => (type === 'p2p' ? 'seed' : type)) From d31e237e7aec202569b1f21d7d0c6c9005c745ef Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Thu, 7 Sep 2023 23:23:52 -0600 Subject: [PATCH 12/13] feat(proton): enable cpu benchmarks for proton-testnet --- .github/workflows/deploy-proton-testnet.yaml | 3 +- webapp/public/sitemap.airwire-testnet.xml | 22 ++++++------ webapp/public/sitemap.airwire.xml | 22 ++++++------ webapp/public/sitemap.jungle.xml | 26 +++++++------- webapp/public/sitemap.lacchain.xml | 30 ++++++++-------- webapp/public/sitemap.libre-testnet.xml | 36 ++++++++++---------- webapp/public/sitemap.libre.xml | 32 ++++++++--------- webapp/public/sitemap.mainnet.xml | 26 +++++++------- webapp/public/sitemap.proton-testnet.xml | 30 +++++++++------- webapp/public/sitemap.proton.xml | 26 +++++++------- webapp/public/sitemap.telos-testnet.xml | 30 ++++++++-------- webapp/public/sitemap.telos.xml | 30 ++++++++-------- webapp/public/sitemap.ultra-testnet.xml | 10 +++--- webapp/public/sitemap.wax-testnet.xml | 22 ++++++------ webapp/public/sitemap.wax.xml | 26 +++++++------- 15 files changed, 188 insertions(+), 183 deletions(-) diff --git a/.github/workflows/deploy-proton-testnet.yaml b/.github/workflows/deploy-proton-testnet.yaml index d7b85d06..73753d1e 100644 --- a/.github/workflows/deploy-proton-testnet.yaml +++ b/.github/workflows/deploy-proton-testnet.yaml @@ -56,7 +56,7 @@ jobs: REACT_APP_SYNC_TOLERANCE_INTERVAL: 180000 REACT_APP_TOKEN_SYMBOL: 'XPR' REACT_APP_NETWORK_URL: '[{"label":"EOS","value":"https://eos.antelope.tools","mainnet":true,"pair":"eos","icon":"eos","order":5},{"label":"Proton","value":"https://proton.antelope.tools","mainnet":true,"pair":"proton","icon":"proton","order":3},{"label":"WAX","value":"https://wax.antelope.tools","mainnet":true,"pair":"wax","icon":"wax","order":4},{"label":"Telos","value":"https://telos.antelope.tools","mainnet":true,"pair":"telos","icon":"telos","order":1},{"label":"Libre","value":"https://libre.antelope.tools","mainnet":true,"pair":"libre","icon":"libre","order":2},{"label":"LACChain EOSIO","value":"https://lacchain.antelope.tools","mainnet":true,"pair":null,"icon":"lacchain","order":6},{"label":"Jungle4 Testnet","value":"https://jungle.antelope.tools","mainnet":false,"pair":"eos","icon":"jungle","order":5},{"label":"Proton Testnet","value":"https://proton-testnet.antelope.tools","mainnet":false,"pair":"proton","icon":"proton","order":3},{"label":"WAX Testnet","value":"https://wax-testnet.antelope.tools","mainnet":false,"pair":"wax","icon":"wax","order":4},{"label":"Telos Testnet","value":"https://telos-testnet.antelope.tools","mainnet":false,"pair":"telos","icon":"telos","order":1},{"label":"Libre Testnet","value":"https://libre-testnet.antelope.tools","mainnet":false,"pair":"libre","icon":"libre","order":2},{"label":"Ultra Testnet","value":"https://ultra-testnet.antelope.tools","mainnet":false,"pair":"ultra","icon":"ultra","order":6}]' - REACT_APP_DISABLED_MENU_ITEMS: '["/missed-blocks","/block-distribution","/cpu-benchmark","/stress-test","/evm","/evm-rpc-endpoints"]' + REACT_APP_DISABLED_MENU_ITEMS: '["/missed-blocks","/block-distribution","/stress-test","/evm","/evm-rpc-endpoints"]' REACT_APP_BLOCK_EXPLORER_URL: 'https://testnet.protonscan.io/transaction/(transaction)' REACT_APP_STATE_HISTORY_ENABLED: 'false' REACT_APP_GOOGLE_ANALITIC_PAGE_ID: 'G-E6Y0EC9FT8' @@ -86,6 +86,7 @@ jobs: HAPI_EOS_BASE_ACCOUNT_PASSWORD: ${{ secrets.HAPI_EOS_BASE_ACCOUNT_PASSWORD }} HAPI_EOS_MECHANICS_ACCOUNT: ${{ secrets.HAPI_EOS_MECHANICS_ACCOUNT }} HAPI_EOS_MECHANICS_PASSWORD: ${{ secrets.HAPI_EOS_MECHANICS_PASSWORD }} + HAPI_EOS_MECHANICS_CUSTOM_PERMISSION: 'benchmark' HAPI_EOS_WALLET_URL: http://dashboard-wallet:8888 HAPI_EOS_BP_JSON_ON_CHAIN: 'false' HAPI_EOS_BP_JSON_ON_CHAIN_CONTRACT: producerjson diff --git a/webapp/public/sitemap.airwire-testnet.xml b/webapp/public/sitemap.airwire-testnet.xml index 560f2b39..e5941b9c 100644 --- a/webapp/public/sitemap.airwire-testnet.xml +++ b/webapp/public/sitemap.airwire-testnet.xml @@ -2,46 +2,46 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> https://dashboard.airwire-testnet.io/ - 2022-10-20 + 2023-09-07 https://dashboard.airwire-testnet.io/block-producers - 2022-10-20 + 2023-09-07 https://dashboard.airwire-testnet.io/nodes - 2022-10-20 + 2023-09-07 https://dashboard.airwire-testnet.io/endpoints - 2022-10-20 + 2023-09-07 https://dashboard.airwire-testnet.io/nodes-distribution - 2022-10-20 + 2023-09-07 https://dashboard.airwire-testnet.io/rewards-distribution - 2022-10-20 + 2023-09-07 https://dashboard.airwire-testnet.io/ricardian-contract - 2022-10-20 + 2023-09-07 https://dashboard.airwire-testnet.io/accounts - 2022-10-20 + 2023-09-07 https://dashboard.airwire-testnet.io/bpjson - 2022-10-20 + 2023-09-07 https://dashboard.airwire-testnet.io/about - 2022-10-20 + 2023-09-07 https://dashboard.airwire-testnet.io/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.airwire.xml b/webapp/public/sitemap.airwire.xml index cd085a91..56cf4a0b 100644 --- a/webapp/public/sitemap.airwire.xml +++ b/webapp/public/sitemap.airwire.xml @@ -2,46 +2,46 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> https://dashboard.airwire.io/ - 2022-10-20 + 2023-09-07 https://dashboard.airwire.io/block-producers - 2022-10-20 + 2023-09-07 https://dashboard.airwire.io/nodes - 2022-10-20 + 2023-09-07 https://dashboard.airwire.io/endpoints - 2022-10-20 + 2023-09-07 https://dashboard.airwire.io/nodes-distribution - 2022-10-20 + 2023-09-07 https://dashboard.airwire.io/rewards-distribution - 2022-10-20 + 2023-09-07 https://dashboard.airwire.io/ricardian-contract - 2022-10-20 + 2023-09-07 https://dashboard.airwire.io/accounts - 2022-10-20 + 2023-09-07 https://dashboard.airwire.io/bpjson - 2022-10-20 + 2023-09-07 https://dashboard.airwire.io/about - 2022-10-20 + 2023-09-07 https://dashboard.airwire.io/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.jungle.xml b/webapp/public/sitemap.jungle.xml index 8158d3fb..d6ecb1fc 100644 --- a/webapp/public/sitemap.jungle.xml +++ b/webapp/public/sitemap.jungle.xml @@ -1,54 +1,54 @@ https://jungle.antelope.tools/ - 2022-10-20 + 2023-09-07 https://jungle.antelope.tools/block-producers - 2022-10-20 + 2023-09-07 https://jungle.antelope.tools/nodes - 2022-10-20 + 2023-09-07 https://jungle.antelope.tools/endpoints - 2022-10-20 + 2023-09-07 https://jungle.antelope.tools/nodes-distribution - 2022-10-20 + 2023-09-07 https://jungle.antelope.tools/rewards-distribution - 2022-10-20 + 2023-09-07 https://jungle.antelope.tools/endpoints-stats - 2023-04-25 + 2023-09-07 https://jungle.antelope.tools/undiscoverable-bps - 2023-01-19 + 2023-09-07 https://jungle.antelope.tools/ricardian-contract - 2022-10-20 + 2023-09-07 https://jungle.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://jungle.antelope.tools/bpjson - 2022-10-20 + 2023-09-07 https://jungle.antelope.tools/about - 2022-10-20 + 2023-09-07 https://jungle.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.lacchain.xml b/webapp/public/sitemap.lacchain.xml index ffa67f4b..59648377 100644 --- a/webapp/public/sitemap.lacchain.xml +++ b/webapp/public/sitemap.lacchain.xml @@ -1,19 +1,19 @@ https://lacchain.antelope.tools/ - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/entities - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/nodes - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/endpoints - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/endpoints-stats @@ -21,46 +21,46 @@ https://lacchain.antelope.tools/lacchain/network - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/nodes-distribution - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/block-distribution - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/missed-blocks - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/cpu-benchmark - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/ricardian-contract - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/management - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/node-config - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/about - 2022-10-20 + 2023-09-07 https://lacchain.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.libre-testnet.xml b/webapp/public/sitemap.libre-testnet.xml index b9467147..1f1c3c6e 100644 --- a/webapp/public/sitemap.libre-testnet.xml +++ b/webapp/public/sitemap.libre-testnet.xml @@ -1,74 +1,74 @@ https://libre-testnet.antelope.tools/ - 2022-10-20 + 2023-09-07 https://libre-testnet.antelope.tools/block-producers - 2022-10-20 + 2023-09-07 https://libre-testnet.antelope.tools/nodes - 2022-10-20 + 2023-09-07 https://libre-testnet.antelope.tools/endpoints - 2022-10-20 + 2023-09-07 https://libre-testnet.antelope.tools/nodes-distribution - 2022-10-20 + 2023-09-07 https://libre-testnet.antelope.tools/rewards-distribution - 2022-10-20 + 2023-09-07 https://libre-testnet.antelope.tools/endpoints-stats - 2023-04-25 + 2023-09-07 https://libre-testnet.antelope.tools/undiscoverable-bps - 2023-01-19 + 2023-09-07 https://libre-testnet.antelope.tools/block-distribution - 2022-10-20 + 2023-09-07 https://libre-testnet.antelope.tools/missed-blocks - 2023-06-20 + 2023-09-07 https://libre-testnet.antelope.tools/stress-test - 2023-06-23 + 2023-09-07 https://libre-testnet.antelope.tools/cpu-benchmark - 2023-05-18 + 2023-09-07 https://libre-testnet.antelope.tools/ricardian-contract - 2022-10-20 + 2023-09-07 https://libre-testnet.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://libre-testnet.antelope.tools/bpjson - 2022-10-20 + 2023-09-07 https://libre-testnet.antelope.tools/faucet - 2023-08-30 + 2023-09-07 https://libre-testnet.antelope.tools/about - 2022-10-20 + 2023-09-07 https://libre-testnet.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.libre.xml b/webapp/public/sitemap.libre.xml index 7a3c29ab..34bb6acf 100644 --- a/webapp/public/sitemap.libre.xml +++ b/webapp/public/sitemap.libre.xml @@ -1,66 +1,66 @@ https://libre.antelope.tools/ - 2022-10-20 + 2023-09-07 https://libre.antelope.tools/block-producers - 2022-10-20 + 2023-09-07 https://libre.antelope.tools/nodes - 2022-10-20 + 2023-09-07 https://libre.antelope.tools/endpoints - 2022-10-20 + 2023-09-07 https://libre.antelope.tools/nodes-distribution - 2022-10-20 + 2023-09-07 https://libre.antelope.tools/rewards-distribution - 2022-10-20 + 2023-09-07 https://libre.antelope.tools/block-distribution - 2023-07-16 + 2023-09-07 https://libre.antelope.tools/missed-blocks - 2023-06-29 + 2023-09-07 https://libre.antelope.tools/cpu-benchmark - 2023-06-07 + 2023-09-07 https://libre.antelope.tools/endpoints-stats - 2023-04-25 + 2023-09-07 https://libre.antelope.tools/undiscoverable-bps - 2023-01-19 + 2023-09-07 https://libre.antelope.tools/ricardian-contract - 2022-10-20 + 2023-09-07 https://libre.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://libre.antelope.tools/bpjson - 2022-10-20 + 2023-09-07 https://libre.antelope.tools/about - 2022-10-20 + 2023-09-07 https://libre.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.mainnet.xml b/webapp/public/sitemap.mainnet.xml index 64194c84..5194a747 100644 --- a/webapp/public/sitemap.mainnet.xml +++ b/webapp/public/sitemap.mainnet.xml @@ -1,54 +1,54 @@ https://eos.antelope.tools/ - 2022-10-20 + 2023-09-07 https://eos.antelope.tools/block-producers - 2022-10-20 + 2023-09-07 https://eos.antelope.tools/nodes - 2022-10-20 + 2023-09-07 https://eos.antelope.tools/endpoints - 2022-10-20 + 2023-09-07 https://eos.antelope.tools/nodes-distribution - 2022-10-20 + 2023-09-07 https://eos.antelope.tools/endpoints-stats - 2023-04-25 + 2023-09-07 https://eos.antelope.tools/rewards-distribution - 2022-10-20 + 2023-09-07 https://eos.antelope.tools/undiscoverable-bps - 2023-01-19 + 2023-09-07 https://eos.antelope.tools/ricardian-contract - 2022-10-20 + 2023-09-07 https://eos.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://eos.antelope.tools/bpjson - 2022-10-20 + 2023-09-07 https://eos.antelope.tools/about - 2022-10-20 + 2023-09-07 https://eos.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.proton-testnet.xml b/webapp/public/sitemap.proton-testnet.xml index 1587e37d..97de9e03 100644 --- a/webapp/public/sitemap.proton-testnet.xml +++ b/webapp/public/sitemap.proton-testnet.xml @@ -2,54 +2,58 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> https://proton-testnet.antelope.tools/ - 2022-10-20 + 2023-09-07 https://proton-testnet.antelope.tools/block-producers - 2022-10-20 + 2023-09-07 https://proton-testnet.antelope.tools/nodes - 2022-10-20 + 2023-09-07 https://proton-testnet.antelope.tools/endpoints - 2022-10-20 + 2023-09-07 https://proton-testnet.antelope.tools/rewards-distribution - 2022-10-20 + 2023-09-07 https://proton-testnet.antelope.tools/endpoints-stats - 2023-04-25 + 2023-09-07 https://proton-testnet.antelope.tools/undiscoverable-bps - 2023-01-19 + 2023-09-07 https://proton-testnet.antelope.tools/nodes-distribution - 2022-10-20 + 2023-09-07 + + + https://proton-testnet.antelope.tools/cpu-benchmark + 2023-09-07 https://proton-testnet.antelope.tools/ricardian-contract - 2022-10-20 + 2023-09-07 https://proton-testnet.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://proton-testnet.antelope.tools/bpjson - 2022-10-20 + 2023-09-07 https://proton-testnet.antelope.tools/about - 2022-10-20 + 2023-09-07 https://proton-testnet.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.proton.xml b/webapp/public/sitemap.proton.xml index 3f459eed..bac35e1c 100644 --- a/webapp/public/sitemap.proton.xml +++ b/webapp/public/sitemap.proton.xml @@ -2,54 +2,54 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> https://proton.antelope.tools/ - 2022-10-20 + 2023-09-07 https://proton.antelope.tools/block-producers - 2022-10-20 + 2023-09-07 https://proton.antelope.tools/nodes - 2022-10-20 + 2023-09-07 https://proton.antelope.tools/endpoints - 2022-10-20 + 2023-09-07 https://proton.antelope.tools/rewards-distribution - 2022-10-20 + 2023-09-07 https://proton.antelope.tools/endpoints-stats - 2023-04-25 + 2023-09-07 https://proton.antelope.tools/undiscoverable-bps - 2023-01-19 + 2023-09-07 https://proton.antelope.tools/nodes-distribution - 2022-10-20 + 2023-09-07 https://proton.antelope.tools/ricardian-contract - 2022-10-20 + 2023-09-07 https://proton.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://proton.antelope.tools/bpjson - 2022-10-20 + 2023-09-07 https://proton.antelope.tools/about - 2022-10-20 + 2023-09-07 https://proton.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.telos-testnet.xml b/webapp/public/sitemap.telos-testnet.xml index c1acf285..0e59a1df 100644 --- a/webapp/public/sitemap.telos-testnet.xml +++ b/webapp/public/sitemap.telos-testnet.xml @@ -2,62 +2,62 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> https://telos-testnet.antelope.tools/ - 2022-10-20 + 2023-09-07 https://telos-testnet.antelope.tools/block-producers - 2022-10-20 + 2023-09-07 https://telos-testnet.antelope.tools/nodes - 2022-10-20 + 2023-09-07 https://telos-testnet.antelope.tools/endpoints - 2022-10-20 + 2023-09-07 https://telos-testnet.antelope.tools/nodes-distribution - 2022-10-20 + 2023-09-07 https://telos-testnet.antelope.tools/rewards-distribution - 2022-10-20 + 2023-09-07 https://telos-testnet.antelope.tools/endpoints-stats - 2023-04-25 + 2023-09-07 https://telos-testnet.antelope.tools/undiscoverable-bps - 2023-01-19 + 2023-09-07 https://telos-testnet.antelope.tools/ricardian-contract - 2022-10-20 + 2023-09-07 https://telos-testnet.antelope.tools/evm - 2023-08-31 + 2023-09-07 https://telos-testnet.antelope.tools/evm-rpc-endpoints - 2023-08-31 + 2023-09-07 https://telos-testnet.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://telos-testnet.antelope.tools/bpjson - 2022-10-20 + 2023-09-07 https://telos-testnet.antelope.tools/about - 2022-10-20 + 2023-09-07 https://telos-testnet.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.telos.xml b/webapp/public/sitemap.telos.xml index 2b258c2e..746760ec 100644 --- a/webapp/public/sitemap.telos.xml +++ b/webapp/public/sitemap.telos.xml @@ -2,62 +2,62 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> https://telos.antelope.tools/ - 2022-10-20 + 2023-09-07 https://telos.antelope.tools/block-producers - 2022-10-20 + 2023-09-07 https://telos.antelope.tools/nodes - 2022-10-20 + 2023-09-07 https://telos.antelope.tools/endpoints - 2022-10-20 + 2023-09-07 https://telos.antelope.tools/nodes-distribution - 2022-10-20 + 2023-09-07 https://telos.antelope.tools/rewards-distribution - 2022-10-20 + 2023-09-07 https://telos.antelope.tools/endpoints-stats - 2023-04-25 + 2023-09-07 https://telos.antelope.tools/undiscoverable-bps - 2023-01-19 + 2023-09-07 https://telos.antelope.tools/ricardian-contract - 2022-10-20 + 2023-09-07 https://telos.antelope.tools/evm - 2023-08-31 + 2023-09-07 https://telos.antelope.tools/evm-rpc-endpoints - 2023-08-31 + 2023-09-07 https://telos.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://telos.antelope.tools/bpjson - 2022-10-20 + 2023-09-07 https://telos.antelope.tools/about - 2022-10-20 + 2023-09-07 https://telos.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.ultra-testnet.xml b/webapp/public/sitemap.ultra-testnet.xml index 4e19ae91..9b526fe9 100644 --- a/webapp/public/sitemap.ultra-testnet.xml +++ b/webapp/public/sitemap.ultra-testnet.xml @@ -2,22 +2,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> https://ultra-testnet.antelope.tools/ - 2022-10-20 + 2023-09-07 https://ultra-testnet.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://ultra-testnet.antelope.tools/faucet - 2022-10-20 + 2023-09-07 https://ultra-testnet.antelope.tools/about - 2022-10-20 + 2023-09-07 https://ultra-testnet.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.wax-testnet.xml b/webapp/public/sitemap.wax-testnet.xml index 4cea775e..6021a315 100644 --- a/webapp/public/sitemap.wax-testnet.xml +++ b/webapp/public/sitemap.wax-testnet.xml @@ -2,27 +2,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> https://wax-testnet.antelope.tools/ - 2022-10-20 + 2023-09-07 https://wax-testnet.antelope.tools/block-producers - 2022-10-20 + 2023-09-07 https://wax-testnet.antelope.tools/nodes - 2022-10-20 + 2023-09-07 https://wax-testnet.antelope.tools/endpoints - 2022-10-20 + 2023-09-07 https://wax-testnet.antelope.tools/nodes-distribution - 2022-10-20 + 2023-09-07 https://wax-testnet.antelope.tools/rewards-distribution - 2022-10-20 + 2023-09-07 https://wax-testnet.antelope.tools/endpoints-stats @@ -34,22 +34,22 @@ https://wax-testnet.antelope.tools/ricardian-contract - 2022-10-20 + 2023-09-07 https://wax-testnet.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://wax-testnet.antelope.tools/bpjson - 2022-10-20 + 2023-09-07 https://wax-testnet.antelope.tools/about - 2022-10-20 + 2023-09-07 https://wax-testnet.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file diff --git a/webapp/public/sitemap.wax.xml b/webapp/public/sitemap.wax.xml index 36a16541..5323f216 100644 --- a/webapp/public/sitemap.wax.xml +++ b/webapp/public/sitemap.wax.xml @@ -2,54 +2,54 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> https://wax.antelope.tools/ - 2022-10-20 + 2023-09-07 https://wax.antelope.tools/block-producers - 2022-10-20 + 2023-09-07 https://wax.antelope.tools/nodes - 2022-10-20 + 2023-09-07 https://wax.antelope.tools/endpoints - 2022-10-20 + 2023-09-07 https://wax.antelope.tools/nodes-distribution - 2022-10-20 + 2023-09-07 https://wax.antelope.tools/rewards-distribution - 2022-10-20 + 2023-09-07 https://wax.antelope.tools/endpoints-stats - 2023-04-25 + 2023-09-07 https://wax.antelope.tools/undiscoverable-bps - 2023-01-19 + 2023-09-07 https://wax.antelope.tools/ricardian-contract - 2022-10-20 + 2023-09-07 https://wax.antelope.tools/accounts - 2022-10-20 + 2023-09-07 https://wax.antelope.tools/bpjson - 2022-10-20 + 2023-09-07 https://wax.antelope.tools/about - 2022-10-20 + 2023-09-07 https://wax.antelope.tools/help - 2022-10-20 + 2023-09-07 \ No newline at end of file From 92bf319f69836875cf89ea8388e19aca83bd663c Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Thu, 7 Sep 2023 23:32:10 -0600 Subject: [PATCH 13/13] feat(proton): enable cpu benchmarks for proton mainnet --- .github/workflows/deploy-proton.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-proton.yaml b/.github/workflows/deploy-proton.yaml index 4ed7fe13..c13df6f8 100644 --- a/.github/workflows/deploy-proton.yaml +++ b/.github/workflows/deploy-proton.yaml @@ -56,7 +56,7 @@ jobs: REACT_APP_SYNC_TOLERANCE_INTERVAL: 180000 REACT_APP_TOKEN_SYMBOL: 'XPR' REACT_APP_NETWORK_URL: '[{"label":"EOS","value":"https://eos.antelope.tools","mainnet":true,"pair":"eos","icon":"eos","order":5},{"label":"Proton","value":"https://proton.antelope.tools","mainnet":true,"pair":"proton","icon":"proton","order":3},{"label":"WAX","value":"https://wax.antelope.tools","mainnet":true,"pair":"wax","icon":"wax","order":4},{"label":"Telos","value":"https://telos.antelope.tools","mainnet":true,"pair":"telos","icon":"telos","order":1},{"label":"Libre","value":"https://libre.antelope.tools","mainnet":true,"pair":"libre","icon":"libre","order":2},{"label":"LACChain EOSIO","value":"https://lacchain.antelope.tools","mainnet":true,"pair":null,"icon":"lacchain","order":6},{"label":"Jungle4 Testnet","value":"https://jungle.antelope.tools","mainnet":false,"pair":"eos","icon":"jungle","order":5},{"label":"Proton Testnet","value":"https://proton-testnet.antelope.tools","mainnet":false,"pair":"proton","icon":"proton","order":3},{"label":"WAX Testnet","value":"https://wax-testnet.antelope.tools","mainnet":false,"pair":"wax","icon":"wax","order":4},{"label":"Telos Testnet","value":"https://telos-testnet.antelope.tools","mainnet":false,"pair":"telos","icon":"telos","order":1},{"label":"Libre Testnet","value":"https://libre-testnet.antelope.tools","mainnet":false,"pair":"libre","icon":"libre","order":2},{"label":"Ultra Testnet","value":"https://ultra-testnet.antelope.tools","mainnet":false,"pair":"ultra","icon":"ultra","order":6}]' - REACT_APP_DISABLED_MENU_ITEMS: '["/missed-blocks","/block-distribution","/cpu-benchmark","/stress-test","/evm","/evm-rpc-endpoints"]' + REACT_APP_DISABLED_MENU_ITEMS: '["/missed-blocks","/block-distribution","/stress-test","/evm","/evm-rpc-endpoints"]' REACT_APP_BLOCK_EXPLORER_URL: 'https://www.protonscan.io/transaction/(transaction)' REACT_APP_STATE_HISTORY_ENABLED: 'false' REACT_APP_GOOGLE_ANALITIC_PAGE_ID: 'G-E6Y0EC9FT8' @@ -86,6 +86,7 @@ jobs: HAPI_EOS_BASE_ACCOUNT_PASSWORD: ${{ secrets.HAPI_EOS_BASE_ACCOUNT_PASSWORD }} HAPI_EOS_MECHANICS_ACCOUNT: ${{ secrets.HAPI_EOS_MECHANICS_ACCOUNT }} HAPI_EOS_MECHANICS_PASSWORD: ${{ secrets.HAPI_EOS_MECHANICS_PASSWORD }} + HAPI_EOS_MECHANICS_CUSTOM_PERMISSION: 'benchmark' HAPI_EOS_WALLET_URL: http://dashboard-wallet:8888 HAPI_EOS_BP_JSON_ON_CHAIN: 'false' HAPI_EOS_BP_JSON_ON_CHAIN_CONTRACT: producerjson