Merge pull request #79 from ar-io/PE-6844-various-bugfixes-and-quick-…

…wins PE-6844: various bugfixes and quick wins
ar-io · Sep 30, 2024 · 68a1fa9 · 68a1fa9
2 parents 6be3432 + 875c356
commit 68a1fa9
Show file tree

Hide file tree

Showing 7 changed files with 134 additions and 95 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -49,6 +49,7 @@ jobs:
           VITE_SENTRY_DSN_PROJECT_URI: ${{ secrets.SENTRY_DSN_PROJECT_URI }}
           VITE_SENTRY_DSN_PROJECT_ID: ${{ secrets.SENTRY_DSN_PROJECT_ID }}
           VITE_GITHUB_HASH: ${{ github.sha }}
+          VITE_IO_PROCESS_ID: ${{ secrets.IO_PROCESS_ID }}
           # ao infra settings
           VITE_AO_CU_URL: ${{ vars.VITE_AO_CU_URL }}
       - name: Add CNAME Record

diff --git a/src/components/Header.tsx b/src/components/Header.tsx
@@ -34,7 +34,7 @@ const Header = () => {
           {gatewaysLoading ? (
             <Placeholder className='h-[1.0625rem]'/>
           ) : gateways ? (
-            Object.keys(gateways).length
+            Object.values(gateways).filter((g) => g.status === "joined").length
           ) : (
             NBSP
           )}

diff --git a/src/hooks/useRewardsInfo.ts b/src/hooks/useRewardsInfo.ts
@@ -7,17 +7,22 @@ import {
 import useGateways from './useGateways';
 import useProtocolBalance from './useProtocolBalance';
 
-const useRewardsInfo = (
-  gateway: AoGateway | undefined,
-  userStake: number
-) => {
+const useRewardsInfo = (gateway: AoGateway | undefined, userStake: number) => {
   const { data: gateways } = useGateways();
   const { data: protocolBalance } = useProtocolBalance();
 
   let res: UserRewards | undefined = undefined;
 
-  if (gateways && gateway && protocolBalance && protocolBalance > 0 && !isNaN(userStake)) {
-    const numGateways = gateways ? Object.keys(gateways).length : 0;
+  if (
+    gateways &&
+    gateway &&
+    protocolBalance &&
+    protocolBalance > 0 &&
+    !isNaN(userStake)
+  ) {
+    const numGateways = gateways
+      ? Object.values(gateways).filter((g) => g.status == 'joined').length
+      : 0;
     const gatewayRewards = calculateGatewayRewards(
       new mIOToken(protocolBalance).toIO(),
       numGateways,
@@ -27,7 +32,7 @@ const useRewardsInfo = (
     const userRewards = calculateUserRewards(
       gatewayRewards,
       new IOToken(Math.abs(userStake)),
-      userStake < 0
+      userStake < 0,
     );
     res = userRewards;
   }

diff --git a/src/pages/Gateway/PropertyDisplayPanel.tsx b/src/pages/Gateway/PropertyDisplayPanel.tsx
@@ -13,16 +13,14 @@ const DisplayRow = ({
   rightComponent,
 }: {
   label: string;
-  value: string | number | boolean | undefined;
+  value: React.ReactNode | string | number | boolean | undefined;
   type?: string;
   rightComponent?: React.ReactNode;
 }) => {
   return (
     <>
       <div className="border-t border-grey-900">
-        <div className=" bg-grey-1000 px-6 py-3 text-xs text-low">
-          {label}
-        </div>
+        <div className=" bg-grey-1000 px-6 py-3 text-xs text-low">{label}</div>
       </div>
       <div className="flex flex-col content-center justify-center border-t border-grey-900 pl-6 text-sm text-low">
         {value === undefined ? (
@@ -79,17 +77,23 @@ const PropertyDisplayPanel = ({
     ? `${gateway.settings.protocol}://${gateway.settings.fqdn}:${gateway.settings.port}`
     : undefined;
 
+  const gatewayLeaving = gateway?.status == 'leaving';
+
   const conditionalRows = gateway?.settings.allowDelegatedStaking
     ? [
         {
           label: 'Reward Share Ratio:',
-          value: `${gateway?.settings.delegateRewardShareRatio}%`,
+          value: gatewayLeaving
+            ? 'N/A'
+            : `${gateway?.settings.delegateRewardShareRatio}%`,
         },
         {
           label: `Minimum Delegated Stake (${ticker}):`,
-          value: new mIOToken(gateway?.settings.minDelegatedStake || 0)
-            .toIO()
-            .valueOf(),
+          value: gatewayLeaving
+            ? 'N/A'
+            : new mIOToken(gateway?.settings.minDelegatedStake || 0)
+                .toIO()
+                .valueOf(),
         },
       ]
     : [];
@@ -109,21 +113,37 @@ const PropertyDisplayPanel = ({
       type: 'tx',
     },
     {
-      label: `Gateway Stake (${ticker}):`,
-      value: gateway?.operatorStake
-        ? new mIOToken(gateway?.operatorStake).toIO().valueOf()
-        : undefined,
+      label: `Gateway Stake abc (${ticker}):`,
+      value:
+        gateway?.operatorStake != undefined
+          ? new mIOToken(gateway?.operatorStake).toIO().valueOf()
+          : undefined,
+    },
+    {
+      label: 'Status:',
+      value:
+        gateway?.status == 'leaving' ? (
+          <div className="text-[#f00]">leaving</div>
+        ) : (
+          gateway?.status
+        ),
     },
-    { label: 'Status:', value: gateway?.status },
     { label: 'Note:', value: gateway?.settings.note },
     {
       label: `Total Delegated Stake (${ticker}):`,
-      value: new mIOToken(gateway?.totalDelegatedStake || 0).toIO().valueOf(),
+      value: gatewayLeaving
+        ? 'N/A'
+        : gateway?.totalDelegatedStake == undefined
+          ? undefined
+          : new mIOToken(gateway.totalDelegatedStake).toIO().valueOf(),
+    },
+    {
+      label: 'Reward Auto Stake:',
+      value: gatewayLeaving ? 'N/A' : gateway?.settings.autoStake,
     },
-    { label: 'Reward Auto Stake:', value: gateway?.settings.autoStake },
     {
       label: 'Delegated Staking:',
-      value: gateway?.settings.allowDelegatedStaking,
+      value: gatewayLeaving ? 'N/A' : gateway?.settings.allowDelegatedStaking,
       rightComponent: gateway?.settings.allowDelegatedStaking ? (
         <Button
           className="mr-2"

diff --git a/src/pages/Gateway/index.tsx b/src/pages/Gateway/index.tsx
@@ -121,10 +121,10 @@ const Gateway = () => {
     : undefined;
 
   const operatorRewards =
-    gateway?.operatorStake && protocolBalance && gateways
+    gateway?.operatorStake != undefined && protocolBalance && gateways
       ? calculateOperatorRewards(
           new mIOToken(protocolBalance).toIO(),
-          Object.keys(gateways).length,
+          Object.values(gateways).filter((g) => g.status == 'joined').length,
           gateway,
         )
       : undefined;
@@ -446,34 +446,37 @@ const Gateway = () => {
                   : undefined
               }
             />
-            <StatsBox
-              title={
-                <div className="flex gap-2">
-                  Operator EAY{' '}
-                  <Tooltip
-                    message={
-                      <div>
-                        <p>{EAY_TOOLTIP_TEXT}</p>
-                        <MathJax className="mt-4">
-                          {OPERATOR_EAY_TOOLTIP_FORMULA}
-                        </MathJax>
-                      </div>
-                    }
-                  >
-                    <InfoIcon className="size-4" />
-                  </Tooltip>
-                </div>
-              }
-              value={
-                operatorRewards
-                  ? `${(operatorRewards.EAY * 100).toFixed(2)}%`
-                  : undefined
-              }
-            />
+
+            {gateway?.status === 'joined' && (
+              <StatsBox
+                title={
+                  <div className="flex gap-2">
+                    Operator EAY{' '}
+                    <Tooltip
+                      message={
+                        <div>
+                          <p>{EAY_TOOLTIP_TEXT}</p>
+                          <MathJax className="mt-4">
+                            {OPERATOR_EAY_TOOLTIP_FORMULA}
+                          </MathJax>
+                        </div>
+                      }
+                    >
+                      <InfoIcon className="size-4" />
+                    </Tooltip>
+                  </div>
+                }
+                value={
+                  operatorRewards != undefined
+                    ? `${(operatorRewards.EAY * 100).toFixed(2)}%`
+                    : undefined
+                }
+              />
+            )}
             {/* <StatsBox title="Rewards Distributed" value={gateway?} /> */}
           </div>
 
-          {gateway?.weights && (
+          {gateway?.weights && gateway?.status === 'joined' && (
             <div className="w-full rounded-xl border border-transparent-100-16 text-sm">
               <div className="px-6 py-4">
                 <div className="text-high">Weights</div>
@@ -486,7 +489,7 @@ const Gateway = () => {
                 >
                   <div className="grow text-xs text-low">{title}:</div>
                   <div className="text-right text-sm">
-                    {value ? value.toFixed(3) : <Placeholder />}
+                    {value !== undefined ? value.toFixed(3) : <Placeholder />}
                   </div>
                 </div>
               ))}

diff --git a/src/pages/Gateways/index.tsx b/src/pages/Gateways/index.tsx
@@ -69,6 +69,8 @@ const Gateways = () => {
             passedEpochCount,
             totalEpochCount,
             streak:
+            gateway.status == "leaving" ? 
+            Number.NEGATIVE_INFINITY :
               gateway.stats.failedConsecutiveEpochs > 0
                 ? -gateway.stats.failedConsecutiveEpochs
                 : gateway.stats.passedConsecutiveEpochs,
@@ -180,6 +182,10 @@ const Gateways = () => {
           return '';
         }
 
+        if (streak === Number.NEGATIVE_INFINITY) {
+          return 'N/A';
+        }
+
         const colorClasses =
           streak > 0
             ? 'border-streak-up/[.56] bg-streak-up/[.1] text-streak-up'

diff --git a/src/pages/Staking/DelegateStakeTable.tsx b/src/pages/Staking/DelegateStakeTable.tsx
@@ -60,53 +60,57 @@ const DelegateStake = () => {
     const stakeableGateways: Array<TableData> =
       !gateways || !protocolBalance
         ? []
-        : Object.entries(gateways).reduce((acc, [owner, gateway]) => {
-            if (gateway.settings.allowDelegatedStaking) {
-              const passedEpochCount = gateway.stats.passedEpochCount;
-              const totalEpochCount = (gateway.stats as any).totalEpochCount;
+        : Object.entries(gateways)
+            .filter((g) => g[1].status === 'joined')
+            .reduce((acc, [owner, gateway]) => {
+              if (gateway.settings.allowDelegatedStaking) {
+                const passedEpochCount = gateway.stats.passedEpochCount;
+                const totalEpochCount = (gateway.stats as any).totalEpochCount;
 
-              return [
-                ...acc,
-                {
-                  label: gateway.settings.label,
-                  domain: gateway.settings.fqdn,
-                  owner,
-                  streak:
-                    gateway.stats.failedConsecutiveEpochs > 0
-                      ? -gateway.stats.failedConsecutiveEpochs
-                      : gateway.stats.passedConsecutiveEpochs,
+                return [
+                  ...acc,
+                  {
+                    label: gateway.settings.label,
+                    domain: gateway.settings.fqdn,
+                    owner,
+                    streak:
+                      gateway.stats.failedConsecutiveEpochs > 0
+                        ? -gateway.stats.failedConsecutiveEpochs
+                        : gateway.stats.passedConsecutiveEpochs,
 
-                  rewardShareRatio: gateway.settings.allowDelegatedStaking
-                    ? gateway.settings.delegateRewardShareRatio
-                    : -1,
-                  performance:
-                    totalEpochCount > 0
-                      ? gateway.stats.passedEpochCount / totalEpochCount
+                    rewardShareRatio: gateway.settings.allowDelegatedStaking
+                      ? gateway.settings.delegateRewardShareRatio
                       : -1,
-                  passedEpochCount,
-                  totalEpochCount,
-                  totalDelegatedStake: new mIOToken(gateway.totalDelegatedStake)
-                    .toIO()
-                    .valueOf(),
-                  operatorStake: new mIOToken(gateway.operatorStake)
-                    .toIO()
-                    .valueOf(),
-                  totalStake: new mIOToken(
-                    gateway.totalDelegatedStake + gateway.operatorStake,
-                  )
-                    .toIO()
-                    .valueOf(),
+                    performance:
+                      totalEpochCount > 0
+                        ? gateway.stats.passedEpochCount / totalEpochCount
+                        : -1,
+                    passedEpochCount,
+                    totalEpochCount,
+                    totalDelegatedStake: new mIOToken(
+                      gateway.totalDelegatedStake,
+                    )
+                      .toIO()
+                      .valueOf(),
+                    operatorStake: new mIOToken(gateway.operatorStake)
+                      .toIO()
+                      .valueOf(),
+                    totalStake: new mIOToken(
+                      gateway.totalDelegatedStake + gateway.operatorStake,
+                    )
+                      .toIO()
+                      .valueOf(),
 
-                  eay: calculateGatewayRewards(
-                    new mIOToken(protocolBalance).toIO(),
-                    Object.keys(gateways).length,
-                    gateway,
-                  ).EAY,
-                },
-              ];
-            }
-            return acc;
-          }, [] as Array<TableData>);
+                    eay: calculateGatewayRewards(
+                      new mIOToken(protocolBalance).toIO(),
+                      Object.values(gateways).filter(g => g.status == "joined").length,
+                      gateway,
+                    ).EAY,
+                  },
+                ];
+              }
+              return acc;
+            }, [] as Array<TableData>);
     setStakeableGateways(stakeableGateways);
   }, [gateways, protocolBalance, walletAddress]);