feat: add waku discovery network enr to bootstrapping nodes by default

graphops · Sep 28, 2023 · 7bfca43 · 7bfca43
1 parent 09a3472
commit 7bfca43
Show file tree

Hide file tree

Showing 11 changed files with 542 additions and 545 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,4 +12,4 @@ panic = 'unwind'
 opt-level = 3
 
 [workspace.dependencies]
-graphcast-sdk = "0.4.3"
+graphcast-sdk = { git = "https://github.com/graphops/graphcast-sdk" }
diff --git a/subgraph-radio/benches/gossips.rs b/subgraph-radio/benches/gossips.rs
@@ -41,7 +41,7 @@ fn gossip_poi_bench(c: &mut Criterion) {
             waku_port: None,
             waku_node_key: None,
             boot_node_addresses: vec![],
-            waku_log_level: None,
+            waku_log_level: "fatal".to_string(),
             waku_addr: None,
             discv5_enrs: None,
             discv5_port: None,

diff --git a/subgraph-radio/src/config.rs b/subgraph-radio/src/config.rs
@@ -99,6 +99,9 @@ impl Config {
     ) -> Result<GraphcastAgentConfig, GraphcastAgentError> {
         let wallet_key = self.wallet_input().unwrap().to_string();
         let topics = self.radio_infrastructure().topics.clone();
+        let mut discv5_enrs = self.waku().discv5_enrs.clone().unwrap_or(vec![]);
+        // Discovery network
+        discv5_enrs.push("enr:-P-4QJI8tS1WTdIQxq_yIrD05oIIW1Xg-tm_qfP0CHfJGnp9dfr6ttQJmHwTNxGEl4Le8Q7YHcmi-kXTtphxFysS11oBgmlkgnY0gmlwhLymh5GKbXVsdGlhZGRyc7hgAC02KG5vZGUtMDEuZG8tYW1zMy53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGdl8ALzYobm9kZS0wMS5kby1hbXMzLndha3V2Mi5wcm9kLnN0YXR1c2ltLm5ldAYfQN4DiXNlY3AyNTZrMaEDbl1X_zJIw3EAJGtmHMVn4Z2xhpSoUaP5ElsHKCv7hlWDdGNwgnZfg3VkcIIjKIV3YWt1Mg8".to_string());
 
         GraphcastAgentConfig::new(
             wallet_key,
@@ -116,7 +119,7 @@ impl Config {
             self.waku().waku_port.clone(),
             self.waku().waku_addr.clone(),
             self.waku().filter_protocol,
-            self.waku().discv5_enrs.clone(),
+            Some(discv5_enrs),
             self.waku().discv5_port,
         )
         .await
@@ -521,9 +524,10 @@ pub struct Waku {
         long,
         value_name = "WAKU_LOG_LEVEL",
         help = "Waku node logging configuration",
+        default_value = "fatal",
         env = "WAKU_LOG_LEVEL"
     )]
-    pub waku_log_level: Option<String>,
+    pub waku_log_level: String,
     #[clap(
         long,
         value_name = "DISCV5_ENRS",
@@ -583,7 +587,7 @@ mod tests {
                 waku_port: None,
                 waku_node_key: None,
                 boot_node_addresses: vec![],
-                waku_log_level: None,
+                waku_log_level: "fatal".to_string(),
                 waku_addr: None,
                 discv5_enrs: None,
                 discv5_port: None,

diff --git a/subgraph-radio/src/operator/mod.rs b/subgraph-radio/src/operator/mod.rs
@@ -119,12 +119,6 @@ impl RadioOperator {
         };
         let notifier = Notifier::from_config(config);
 
-        GRAPHCAST_AGENT
-            .get()
-            .unwrap()
-            .register_handler()
-            .expect("Could not register handler");
-
         RadioOperator {
             config: config.clone(),
             persisted_state,

diff --git a/test-runner/Cargo.toml b/test-runner/Cargo.toml
@@ -21,7 +21,7 @@ categories = [
 ]
 
 [dependencies]
-waku = { version = "0.1.1", package = "waku-bindings" }
+waku = { version = "0.3.0", package = "waku-bindings" }
 test-utils = { path = "../test-utils" }
 graphcast-sdk = { workspace = true }
 subgraph-radio = { path = "../subgraph-radio" }

diff --git a/test-sender/Cargo.toml b/test-sender/Cargo.toml
@@ -21,7 +21,7 @@ categories = [
 ]
 
 [dependencies]
-waku = { version = "0.1.1", package = "waku-bindings" }
+waku = { version = "0.3.0", package = "waku-bindings" }
 graphcast-sdk = { workspace = true }
 test-utils = { path = "../test-utils" }
 subgraph-radio = { path = "../subgraph-radio" }

diff --git a/test-sender/src/main.rs b/test-sender/src/main.rs
@@ -60,6 +60,8 @@ async fn start_sender(config: TestSenderConfig) {
         store_retention_max_messages: None,
         store_retention_max_seconds: None,
         gossipsub_params: Some(gossipsub_params),
+        dns4_domain_name: None,
+        websocket_params: None,
     };
 
     let node_handle = waku_new(Some(node_config)).unwrap().start().unwrap();

diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
@@ -21,7 +21,7 @@ categories = [
 ]
 
 [dependencies]
-waku = { version = "0.1.1", package = "waku-bindings" }
+waku = { version = "0.3.0", package = "waku-bindings" }
 graphcast-sdk = { workspace = true }
 subgraph-radio = { path = "../subgraph-radio" }
 tokio = { version = "1.1.1", features = ["full", "rt"] }

diff --git a/test-utils/src/config.rs b/test-utils/src/config.rs
@@ -47,7 +47,7 @@ pub fn test_config() -> Config {
                 waku_node_key: None,
                 waku_addr: None,
                 boot_node_addresses: vec![],
-                waku_log_level: None,
+                waku_log_level: "fatal".to_string(),
                 discv5_enrs: None,
                 discv5_port: None,
                 filter_protocol: None,

diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs
@@ -198,7 +198,7 @@ pub fn start_radio(config: &Config) -> Child {
                 .to_string(),
         )
         .arg("--waku-log-level")
-        .arg(config.waku().waku_log_level.as_deref().unwrap_or("None"))
+        .arg(config.waku().waku_log_level.clone())
         .arg("--waku-port")
         .arg(config.waku().waku_port.as_deref().unwrap_or("None"))
         .arg("--log-level")