Fix eligibility check for banned/suspended nodes (#439)

* Handle eligibility banned/suspended

* fix banned condition

* add banned/suspended until date

* fix condition

Author: andreip136

src/components/node-details/eligibility.tsx

@@ -1,5 +1,6 @@
 import Card from '@/components/card/card';
 import { Node } from '@/types/nodes';
+import { formatDateTime } from '@/utils/formatters';
 import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline';
 import HighlightOffIcon from '@mui/icons-material/HighlightOff';
 import VerifiedIcon from '@mui/icons-material/Verified';
@@ -11,11 +12,13 @@ type EligibilityProps = {
 };
 
 const Eligibility = ({ isAdmin, node }: EligibilityProps) => {
-  const { banReason, eligibilityCauseStr } = node;
-  const verified = !!node.latestBenchmarkResults;
+  const now = Date.now();
+  const isBanned = node.banned || (node.bannedUntil && now < node.bannedUntil);
+  const isSuspended = node.suspendedUntil && now < node.suspendedUntil;
+  const isVerified = !!node.latestBenchmarkResults && !isBanned && !isSuspended;
 
-  // [All roles] Verified and not banned
-  if (verified && !node.banned) {
+  // [All roles] Verified and NOT Banned / Suspended
+  if (isVerified) {
     return (
       <Card direction="column" padding="sm" radius="md" shadow="success" spacing="sm" variant="success">
         <div className={styles.header}>
@@ -28,23 +31,42 @@ const Eligibility = ({ isAdmin, node }: EligibilityProps) => {
   }
 
   if (isAdmin) {
-    // [Admins] Banned
-    if (node.banned) {
+    const suspensionDate = (
+      <>
+        {node.bannedUntil ? (
+          <div className={styles.reason}>
+            <strong className="alignSelfStart">Banned until:</strong>{' '}
+            <span>{formatDateTime(node.bannedUntil / 1000)}</span>
+          </div>
+        ) : null}
+        {node.suspendedUntil ? (
+          <div className={styles.reason}>
+            <strong className="alignSelfStart">Suspended until:</strong>{' '}
+            <span>{formatDateTime(node.suspendedUntil / 1000)}</span>
+          </div>
+        ) : null}
+      </>
+    );
+
+    // [Admins] Banned / Suspended
+    if (isBanned || isSuspended) {
       return (
         <Card direction="column" padding="sm" radius="md" shadow="error" spacing="sm" variant="error">
           <div className={styles.header}>
             <HighlightOffIcon className={styles.icon} />
             <h3>Banned</h3>
           </div>
           <div>This node is excluded from all operations and rewards</div>
+          {suspensionDate}
           <div className={styles.reason}>
-            <strong className="alignSelfStart">Reason:</strong> <span>{banReason ?? 'Unknown'}</span>
+            <strong className="alignSelfStart">Reason:</strong>{' '}
+            <span>{node.banReason || node.eligibilityCauseStr || 'Unknown'}</span>
           </div>
         </Card>
       );
     }
 
-    // [Admins] Non-eligible
+    // [Admins] NOT Eligible
     if (!node.eligible) {
       return (
         <Card direction="column" padding="sm" radius="md" shadow="warning" spacing="sm" variant="warning">
@@ -53,29 +75,31 @@ const Eligibility = ({ isAdmin, node }: EligibilityProps) => {
             <h3>Not eligible</h3>
           </div>
           <div>This node is active, but not eligible for rewards</div>
+          {suspensionDate}
           <div className={styles.reason}>
-            <strong className="alignSelfStart">Reason:</strong> <span>{eligibilityCauseStr ?? 'Unknown'}</span>
+            <strong className="alignSelfStart">Reason:</strong> <span>{node.eligibilityCauseStr || 'Unknown'}</span>
           </div>
         </Card>
       );
     }
 
-    // [Admins] Not verified
+    // [Admins] NOT Verified
     return (
       <Card direction="column" padding="sm" radius="md" shadow="warning" spacing="sm" variant="warning">
         <div className={styles.header}>
           <ErrorOutlineIcon className={styles.icon} />
           <h3>Not verified</h3>
         </div>
         <div>This node is active, but not verified via benchmark</div>
+        {suspensionDate}
         <div className={styles.reason}>
-          <strong className="alignSelfStart">Reason:</strong> <span>{eligibilityCauseStr ?? 'Unknown'}</span>
+          <strong className="alignSelfStart">Reason:</strong> <span>{node.eligibilityCauseStr || 'Unknown'}</span>
         </div>
       </Card>
     );
   }
 
-  // [Non-admins] Not verified
+  // [Non-admins] NOT Verified
   return (
     <Card direction="column" padding="sm" radius="md" shadow="warning" spacing="sm" variant="warning">
       <div className={styles.header}>

src/types/nodes.ts

@@ -21,6 +21,10 @@ export type NodeBanInfo = {
 
 export type Node = {
   allowedAdmins?: string[];
+  banned: boolean;
+  bannedAt?: number;
+  bannedUntil?: number;
+  banReason?: string;
   cpus: CPU[];
   currentAddrs?: string[];
   eligible?: boolean;
@@ -58,14 +62,11 @@ export type Node = {
   };
   provider?: Array<{ network: string }>;
   region: string;
+  supportedStorage: any;
+  suspendedUntil?: number;
   totalJobs: number;
   totalRevenue: number;
   version?: string;
-  supportedStorage: any;
-  banned: boolean;
-  banReason: string;
-  bannedAt: number;
-  bannedUntil: number;
 };
 
 type GPU = {