Prevent bootnode adding its own ENR

sigp · Jul 29, 2021 · 0c25e92 · 0c25e92
1 parent a3fb7b3
commit 0c25e92
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/boot_node/src/server.rs b/boot_node/src/server.rs
@@ -40,13 +40,22 @@ pub async fn run<T: EthSpec>(config: BootNodeConfig<T>, log: slog::Logger) {
     };
 
     // construct the discv5 server
-    let mut discv5 = Discv5::new(config.local_enr, config.local_key, discv5_config).unwrap();
+    let mut discv5 =
+        Discv5::new(config.local_enr.clone(), config.local_key, discv5_config).unwrap();
 
     // If there are any bootnodes add them to the routing table
     for enr in config.boot_nodes {
-        info!(log, "Adding bootnode"; "address" => format!("{:?}", enr.udp_socket()), "peer_id" => enr.peer_id().to_string(), "node_id" => enr.node_id().to_string());
-        if let Err(e) = discv5.add_enr(enr) {
-            slog::warn!(log, "Failed adding ENR"; "error" => e.to_string());
+        info!(
+            log,
+            "Adding bootnode";
+            "address" => ?enr.udp_socket(),
+            "peer_id" => enr.peer_id().to_string(),
+            "node_id" => enr.node_id().to_string()
+        );
+        if enr != config.local_enr {
+            if let Err(e) = discv5.add_enr(enr) {
+                slog::warn!(log, "Failed adding ENR"; "error" => e.to_string());
+            }
         }
     }