fix(op): configure discv5 properly in op builder (#9058)

paradigmxyz · Jun 24, 2024 · 83d412d · 83d412d
1 parent c5aee02
commit 83d412d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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);