From 74da2de3b769e584aad1c2f0aa4887d9b599c33d Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 27 Feb 2020 21:26:53 -0700
Subject: [PATCH] Ensure the validator's identity pubkey is not provided as a
 --trusted-validator (#8525)

automerge
---
 validator/src/main.rs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/validator/src/main.rs b/validator/src/main.rs
index 0f410462f..f8f0ba528 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -847,8 +847,18 @@ pub fn main() {
     });
 
     let trusted_validators = if matches.is_present("trusted_validators") {
-        let trusted_validators = values_t_or_exit!(matches, "trusted_validators", Pubkey);
-        Some(trusted_validators.into_iter().collect())
+        let trusted_validators: HashSet<_> =
+            values_t_or_exit!(matches, "trusted_validators", Pubkey)
+                .into_iter()
+                .collect();
+        if trusted_validators.contains(&identity_keypair.pubkey()) {
+            eprintln!(
+                "The validator's identity pubkey cannot be a --trusted-validator: {}",
+                identity_keypair.pubkey()
+            );
+            exit(1);
+        }
+        Some(trusted_validators)
     } else {
         None
     };