From ba8850f1f052cda4752e7cd9bc7bd02f5d2c068e Mon Sep 17 00:00:00 2001
From: Michael Sproul <michael@sigmaprime.io>
Date: Mon, 7 Jun 2021 10:34:18 +1000
Subject: [PATCH] Ignore inactive validators in validator monitor

---
 beacon_node/beacon_chain/src/validator_monitor.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/beacon_node/beacon_chain/src/validator_monitor.rs b/beacon_node/beacon_chain/src/validator_monitor.rs
index f3ef3aa8813..015efe0c64e 100644
--- a/beacon_node/beacon_chain/src/validator_monitor.rs
+++ b/beacon_node/beacon_chain/src/validator_monitor.rs
@@ -353,8 +353,7 @@ impl<T: EthSpec> ValidatorMonitor<T> {
                             "matched_head" => summary.is_previous_epoch_head_attester,
                             "epoch" => prev_epoch,
                             "validator" => id,
-
-                        )
+                        );
                     } else if summary.is_active_in_previous_epoch
                         && !summary.is_previous_epoch_attester
                     {
@@ -364,6 +363,11 @@ impl<T: EthSpec> ValidatorMonitor<T> {
                             "epoch" => prev_epoch,
                             "validator" => id,
                         )
+                    } else if !summary.is_active_in_previous_epoch {
+                        // Monitored validator is not active, due to awaiting activation
+                        // or being exited/withdrawn. Do not attempt to report on its
+                        // attestations.
+                        continue;
                     }
 
                     if summary.is_previous_epoch_attester {