Feat/mfx power conversion (#327)

liftedinit · Nov 21, 2024 · c16028c · c16028c
1 parent 0651a5d
commit c16028c
Show file tree

Hide file tree

Showing 12 changed files with 2,265 additions and 2,342 deletions.
diff --git a/client/src/api/queries.ts b/client/src/api/queries.ts
@@ -84,9 +84,10 @@ export function getMetricCurrent(
 
 export function getMetricSeries(
   stat?: string, 
-  {from = FROM, to = TO } = {}
+  smoothed?: boolean,
+  {from = FROM, to = TO } = {},
 ) {
-    return get(`metrics/${stat}/series`, { from, to });
+    return get(`metrics/${stat}/series`, { from, to, smoothed });
 }
 
 export function getMetricTransformCurrent(
@@ -105,20 +106,6 @@ export function getMetricTransformSeries(
     return get(`metrics/transforms/${stat}/${transform}/series`, { from, to });
 }
 
-export function getMetricSystemWideCurrent(
-  metric?: string,
-) {
-  return get(`metrics/systemwide/${metric}/current`);
-}
-
-export function getMetricSystemWideSeries(
-  metric?: string,
-  {from = FROM, to = TO } = {}
-) {
-    return get(`metrics/systemwide/${metric}/series`, { from, to });
-}
-
 export function getLocations() {
   return get("location");
 }
-
diff --git a/client/src/pages/metrics/networkMetrics.tsx b/client/src/pages/metrics/networkMetrics.tsx
@@ -7,18 +7,28 @@ export function NetworkMetrics() {
   return (
     <>
       <Heading as='h4' size='md' py="5" pl="5" >Blockchain Network Totals</Heading>
-      <SimpleGrid id="blockchain" columns={{ base: 1, sm: 1, md: 2, lg: 4 }} gap="6" mt={2}>
+      <SimpleGrid id="blockchain" columns={{ base: 1, sm: 1, md: 2, lg: 3 }} gap="6" mt={2}>
         <Box backgroundColor="transparent">
-          <MetricStat label="Total Blocks Produced" metric="totalblocks" systemwide />
+          <MetricStat label="POWER : MFX Conversion Rate" metric="mfxpowerconversion" unit=": 1" fixedDecimals={2}  />
+          <MetricChart label="POWER:MFX" type="area" metric="mfxpowerconversion" from={"now-180d"} to={"now"} fixedDecimals={2} smoothed={false} />
         </Box>
         <Box backgroundColor="transparent">
-          <MetricStat label="Total Transactions" metric="totaltransactions" systemwide />
+          <MetricStat label="Total Addresses" metric="totaladdresses" />
+          <MetricChart label="Total Addresses" type="area" metric="totaladdresses" from={"now-60d"} to={"now"} fixedDecimals={0} ytitle="Addresses" smoothed={false} />
         </Box>
         <Box backgroundColor="transparent">
-          <MetricStat label="Total Addresses" metric="totaladdresses" systemwide />
+          <MetricStat label="Total Tokens" metric="totaltokens" />
+          <MetricChart label="Total Tokens" type="area" metric="totaltokens" from={"now-60d"} to={"now"} fixedDecimals={0} ytitle="Tokens" smoothed={false} />
+        </Box>
+      </SimpleGrid>
+      <SimpleGrid id="blockchain" columns={{ base: 1, sm: 1, md: 2, lg: 2 }} gap="6" mt={2}>
+        <Box backgroundColor="transparent">
+          <MetricStat label="Total Blocks Produced" metric="totalnetworkblocks" />
+          <MetricChart label="Total Blocks Produced" type="area" metric="totalnetworkblocks" from={"now-60d"} to={"now"} fixedDecimals={0} ytitle="Blocks" smoothed={false} />
         </Box>
         <Box backgroundColor="transparent">
-          <MetricStat label="Total Tokens" metric="totaltokens" from={"now-1d"} to={"now"} />
+          <MetricStat label="Total Transactions" metric="totaltransactions" />
+          <MetricChart label="Total Transactions" type="area" metric="totaltransactions" from={"now-60d"} to={"now"} fixedDecimals={0} ytitle="Transactions" smoothed={false} />
         </Box>
       </SimpleGrid>
       <Heading as='h4' size='md' py="5" pl="5" >Nodes</Heading>

diff --git a/client/src/ui/metric-chart.tsx b/client/src/ui/metric-chart.tsx
@@ -19,6 +19,7 @@ interface StatProps {
   conversion?: Function;
   from?: string;
   to?: string;
+  smoothed?: boolean;
   fixedDecimals?: number;
   transform?: string;
 }
@@ -40,6 +41,7 @@ export function MetricChart({
   conversion, 
   from, 
   to, 
+  smoothed = true,
   xtitle, 
   ytitle, 
   fixedDecimals,
@@ -54,7 +56,7 @@ export function MetricChart({
     metricQuery = getMetricTransformSeries(metric, transform, {from: from, to: to })
     }
   else {
-    metricQuery = getMetricSeries(metric,{from: from, to: to })
+    metricQuery = getMetricSeries(metric, smoothed, {from: from, to: to })
   }
 
   const { data: queryData, isError, isLoading } = useQuery([metric + "series"], metricQuery, {

diff --git a/client/src/ui/metric-stat.tsx b/client/src/ui/metric-stat.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from "react"
 import { Stat as BaseStat, StatLabel, StatNumber } from "@liftedinit/ui";
 import { useQuery } from "@tanstack/react-query";
-import { getMetricCurrent, getMetricTransformCurrent, getMetricSystemWideCurrent } from "api";
+import { getMetricCurrent, getMetricTransformCurrent } from "api";
 import { Box, Center, Spinner } from "@liftedinit/ui";
 import { useBgColor, LONG_STALE_INTERVAL, LONG_REFRESH_INTERVAL } from "utils";
 
@@ -14,7 +14,6 @@ interface StatProps {
   unit?: string;
   fixedDecimals?: number;
   transform?: string;
-  systemwide?: boolean;
 }
 
 interface QueryData {
@@ -38,7 +37,6 @@ export function MetricStat({
   fixedDecimals,
   unit,
   transform,
-  systemwide,
 }: StatProps) {
 
   const bg = useBgColor();
@@ -50,9 +48,6 @@ export function MetricStat({
   if (transform) {
     metricQuery = getMetricTransformCurrent(metric, transform, {from: from, to: to })
     }
-  else if (systemwide) {
-    metricQuery = getMetricSystemWideCurrent(metric)
-  }
   else {
     metricQuery = getMetricCurrent(metric, {from: from, to: to })
   }