From 83d412da70af678a46f368533b6df45a287a1ce6 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Mon, 24 Jun 2024 18:01:42 +0200
Subject: [PATCH] fix(op): configure discv5 properly in op builder (#9058)

---
 crates/net/discv5/src/config.rs      |  2 +-
 crates/node-core/src/args/network.rs |  2 +-
 crates/optimism/node/src/node.rs     | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/crates/net/discv5/src/config.rs b/crates/net/discv5/src/config.rs
index da36d8f1c81f..669e7d04fe04 100644
--- a/crates/net/discv5/src/config.rs
+++ b/crates/net/discv5/src/config.rs
@@ -131,7 +131,7 @@ impl ConfigBuilder {
     }
 
     /// Adds boot nodes in the form a list of [`NodeRecord`]s, parsed enodes.
-    pub fn add_unsigned_boot_nodes(mut self, enodes: impl Iterator<Item = NodeRecord>) -> Self {
+    pub fn add_unsigned_boot_nodes(mut self, enodes: impl IntoIterator<Item = NodeRecord>) -> Self {
         for node in enodes {
             if let Ok(node) = BootNode::from_unsigned(node) {
                 self.bootstrap_nodes.insert(node);
diff --git a/crates/node-core/src/args/network.rs b/crates/node-core/src/args/network.rs
index 28eb9f29bbb4..a5763495cd8d 100644
--- a/crates/node-core/src/args/network.rs
+++ b/crates/node-core/src/args/network.rs
@@ -185,7 +185,7 @@ impl NetworkArgs {
                 } = self.discovery;
 
                 builder
-                    .add_unsigned_boot_nodes(chain_bootnodes.into_iter())
+                    .add_unsigned_boot_nodes(chain_bootnodes)
                     .lookup_interval(discv5_lookup_interval)
                     .bootstrap_lookup_interval(discv5_bootstrap_lookup_interval)
                     .bootstrap_lookup_countdown(discv5_bootstrap_lookup_countdown)
diff --git a/crates/optimism/node/src/node.rs b/crates/optimism/node/src/node.rs
index 1b64dcce691d..d8628dc6bf85 100644
--- a/crates/optimism/node/src/node.rs
+++ b/crates/optimism/node/src/node.rs
@@ -292,6 +292,18 @@ where
                 }
 
                 builder
+            })
+            // ensure we configure discv5
+            .map_discv5_config_builder(|builder| {
+                builder
+                    .add_unsigned_boot_nodes(ctx.chain_spec().bootnodes().unwrap_or_default())
+                    .lookup_interval(ctx.config().network.discovery.discv5_lookup_interval)
+                    .bootstrap_lookup_interval(
+                        ctx.config().network.discovery.discv5_bootstrap_lookup_interval,
+                    )
+                    .bootstrap_lookup_countdown(
+                        ctx.config().network.discovery.discv5_bootstrap_lookup_countdown,
+                    )
             });
 
         let mut network_config = ctx.build_network_config(network_builder);