Merge pull request #56 from ar-io/develop

Deploy to Production
ar-io · Jul 24, 2024 · 665eed9 · 665eed9
2 parents 5d6d934 + 7d59e32
commit 665eed9
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 14 deletions.
diff --git a/src/pages/Gateways/index.tsx b/src/pages/Gateways/index.tsx
@@ -21,7 +21,9 @@ interface TableData {
   operatorStake: number; // IO
   totalStake: number; // IO
   status: string;
-  rewardRatio: number;
+  performance: number;
+  passedEpochCount: number;
+  totalEpochCount: number;
   streak: number;
 }
 
@@ -36,6 +38,10 @@ const Gateways = () => {
   useEffect(() => {
     const tableData: Array<TableData> = Object.entries(gateways ?? {}).reduce(
       (acc: Array<TableData>, [owner, gateway]) => {
+
+        const passedEpochCount = gateway.stats.passedEpochCount;
+        const totalEpochCount = (gateway.stats as any).totalEpochCount;
+
         return [
           ...acc,
           {
@@ -53,9 +59,12 @@ const Gateways = () => {
               .toIO()
               .valueOf(),
             status: gateway.status,
-            rewardRatio: gateway.settings.allowDelegatedStaking
-              ? gateway.settings.delegateRewardShareRatio
-              : -1,
+            performance:
+              totalEpochCount > 0
+                ? passedEpochCount / totalEpochCount
+                : -1,
+            passedEpochCount,
+            totalEpochCount,
             streak:
               gateway.stats.failedConsecutiveEpochs > 0
                 ? -gateway.stats.failedConsecutiveEpochs
@@ -134,12 +143,29 @@ const Gateways = () => {
       header: 'Status',
       sortDescFirst: false,
     }),
-    columnHelper.accessor('rewardRatio', {
-      id: 'rewardRatio',
-      header: 'Reward Share Ratio',
+    columnHelper.accessor('performance', {
+      id: 'performance',
+      header: 'Performance',
       sortDescFirst: true,
       cell: ({ row }) =>
-        row.original.rewardRatio >= 0 ? `${row.original.rewardRatio}%` : 'N/A',
+        row.original.performance < 0 ? (
+          'N/A'
+        ) : (
+          <Tooltip
+            message={
+              <div>
+                <div>
+                  Passed Epoch Count: {row.original.passedEpochCount}
+                </div>
+                <div className="mt-1">
+                  Total Epoch Participation Count: {row.original.totalEpochCount}
+                </div>
+              </div>
+            }
+          >
+            {`${(row.original.performance * 100).toFixed(2)}%`}
+          </Tooltip>
+        ),
     }),
     columnHelper.accessor('streak', {
       id: 'streak',

diff --git a/src/pages/Staking/DelegateStakeTable.tsx b/src/pages/Staking/DelegateStakeTable.tsx
@@ -25,7 +25,10 @@ interface TableData {
   domain: string;
   owner: string;
   failedConsecutiveEpochs: number;
-  rewardRatio: number;
+  rewardShareRatio: number;
+  performance: number;
+  passedEpochCount: number;
+  totalEpochCount: number;
   totalDelegatedStake: number;
   totalStake: number;
   operatorStake: number;
@@ -55,6 +58,9 @@ const DelegateStake = () => {
         ? []
         : Object.entries(gateways).reduce((acc, [owner, gateway]) => {
             if (gateway.settings.allowDelegatedStaking) {
+              const passedEpochCount = gateway.stats.passedEpochCount;
+              const totalEpochCount = (gateway.stats as any).totalEpochCount;
+
               return [
                 ...acc,
                 {
@@ -63,8 +69,13 @@ const DelegateStake = () => {
                   owner,
                   failedConsecutiveEpochs:
                     gateway.stats.failedConsecutiveEpochs,
-                  rewardRatio: gateway.settings.delegateRewardShareRatio,
 
+                  rewardShareRatio: gateway.settings.allowDelegatedStaking
+                    ? gateway.settings.delegateRewardShareRatio
+                    : -1,
+                  performance: totalEpochCount > 0 ? gateway.stats.passedEpochCount / totalEpochCount : -1,
+                  passedEpochCount,
+                  totalEpochCount,
                   totalDelegatedStake: new mIOToken(gateway.totalDelegatedStake)
                     .toIO()
                     .valueOf(),
@@ -142,16 +153,41 @@ const DelegateStake = () => {
         </Tooltip>
       ),
     }),
+    columnHelper.accessor('rewardShareRatio', {
+      id: 'rewardShareRatio',
+      header: 'Reward Share Ratio',
+      sortDescFirst: true,
+      cell: ({ row }) =>
+        row.original.rewardShareRatio >= 0 ? `${row.original.rewardShareRatio}%` : 'N/A',
+    }),
     columnHelper.accessor('failedConsecutiveEpochs', {
       id: 'failedConsecutiveEpochs',
       header: 'Offline Epochs',
       sortDescFirst: true,
     }),
-    columnHelper.accessor('rewardRatio', {
-      id: 'rewardRatio',
-      header: 'Reward Share Ratio',
+    columnHelper.accessor('performance', {
+      id: 'performance',
+      header: 'Performance',
       sortDescFirst: true,
-      cell: ({ row }) => `${row.original.rewardRatio}%`,
+      cell: ({ row }) =>
+        row.original.performance < 0 ? (
+          'N/A'
+        ) : (
+          <Tooltip
+            message={
+              <div>
+                <div>
+                  Passed Epoch Count: {row.original.passedEpochCount}
+                </div>
+                <div className="mt-1">
+                  Total Epoch Participation Count: {row.original.totalEpochCount}
+                </div>
+              </div>
+            }
+          >
+            {`${(row.original.performance * 100).toFixed(2)}%`}
+          </Tooltip>
+        ),
     }),
     columnHelper.accessor('eay', {
       id: 'eay',