Extracted logging to a function and included all validator statuses (C…

…hainSafe#4785)
maschad · Feb 22, 2023 · 1014495 · 1014495
1 parent 2a9b72f
commit 1014495
Showing 1 changed file with 37 additions and 8 deletions.
diff --git a/packages/validator/src/services/indices.ts b/packages/validator/src/services/indices.ts
@@ -117,18 +117,47 @@ export class IndicesService {
       }
     }
 
-    allValidators.get("active")?.forEach((validatorState: ValidatorResponse) => {
-      this.logger.info("Validator activated", {
+    logValidatorStatuses(allValidators, this.logger);
+
+    return newIndices;
+  }
+}
+
+function logValidatorStatuses(allValidators: Map<ValidatorStatus, ValidatorResponse[]>, logger: Logger): void {
+  allValidators.get("active")?.forEach((validatorState: ValidatorResponse) => {
+    logger.info("Validator activated", {
+      pubkey: toHexString(validatorState.validator.pubkey),
+      index: validatorState.index,
+    });
+  });
+
+  [...(allValidators.get("pending_initialized") ?? []), ...(allValidators.get("pending_queued") ?? [])]?.forEach(
+    (validatorState: ValidatorResponse) => {
+      logger.info("Validator pending", {
         pubkey: toHexString(validatorState.validator.pubkey),
         index: validatorState.index,
       });
-    });
+    }
+  );
 
-    this.logger.info("Initialized Validators: ", {
-      total: allValidators.size,
-      available: allValidators.get("active")?.length,
+  allValidators.get("withdrawal_done")?.forEach((validatorState: ValidatorResponse) => {
+    logger.info("Validator withdrawn", {
+      pubkey: toHexString(validatorState.validator.pubkey),
+      index: validatorState.index,
     });
+  });
 
-    return newIndices;
-  }
+  [...(allValidators.get("exited_slashed") ?? []), ...(allValidators.get("exited_unslashed") ?? [])]?.forEach(
+    (validatorState: ValidatorResponse) => {
+      logger.info("Validator Exited", {
+        pubkey: toHexString(validatorState.validator.pubkey),
+        index: validatorState.index,
+      });
+    }
+  );
+
+  logger.info("Initialized Validators: ", {
+    total: allValidators.size,
+    available: allValidators.get("active")?.length,
+  });
 }