Update after nwaku cleanup

.cargo/config.toml

@@ -2,3 +2,6 @@
 # when using osx, we need to link against some golang libraries, it did just work with this missing flags
 # from: https://github.com/golang/go/issues/42459
 rustflags = ["-C", "link-args=-framework CoreFoundation -framework Security -framework CoreServices -lresolv"]
+
+[target.x86_64-unknown-linux-gnu]
+linker = "cc"

.github/workflows/codecov.yml

@@ -8,7 +8,7 @@ name: Codecov
 
 jobs:
   test:
-    name: Test
+    name: Test-codecov
     env:
       RUSTFLAGS: -C instrument-coverage
     runs-on: ubuntu-latest
@@ -23,7 +23,7 @@ jobs:
           go-version: '1.20'
       - uses: actions-rs/toolchain@v1
         with:
-          profile: minimal
+          profile: default
           toolchain: stable
           override: true
           components: llvm-tools-preview

.github/workflows/main.yml

@@ -8,6 +8,22 @@ on:
 
 name: CI
 
+# Make sure cc linker is used on Linux/macOS
+x-setup-linker: &setup-linker
+  - name: Setup linker
+    run: |
+      mkdir -p .cargo
+      cat > .cargo/config.toml <<EOF
+      [target.x86_64-unknown-linux-gnu]
+      linker = "cc"
+
+      [target.aarch64-apple-darwin]
+      linker = "cc"
+
+      [target.x86_64-apple-darwin]
+      linker = "cc"
+      EOF
+
 jobs:
   check:
     name: Check
@@ -19,7 +35,7 @@ jobs:
           #- os: windows-latest
           #  toolchain: stable-x86_64-pc-windows-gnu
           - os: macos-latest
-            toolchain: stable-x86_64-apple-darwin
+            toolchain: stable
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -29,7 +45,7 @@ jobs:
         run: git submodule update --init --recursive
       - uses: actions-rs/toolchain@v1
         with:
-          profile: minimal
+          profile: default
           toolchain: ${{ matrix.toolchain }}
           default: true
           override: true
@@ -48,7 +64,7 @@ jobs:
           #- os: windows-latest
           #  toolchain: stable-x86_64-pc-windows-gnu
           - os: macos-latest
-            toolchain: stable-x86_64-apple-darwin
+            toolchain: stable
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -58,10 +74,11 @@ jobs:
         run: git submodule update --init --recursive
       - uses: actions-rs/toolchain@v1
         with:
-          profile: minimal
+          profile: default
           toolchain: ${{ matrix.toolchain }}
           default: true
           override: true
+      - *setup-linker
       - uses: actions-rs/cargo@v1
         continue-on-error: false
         with:
@@ -82,7 +99,7 @@ jobs:
         run: git submodule update --init --recursive
       - uses: actions-rs/toolchain@v1
         with:
-          profile: minimal
+          profile: default
           toolchain: stable
           override: true
           components: rustfmt, clippy

Cargo.toml

@@ -4,4 +4,5 @@ members = [
     "waku-bindings",
     "waku-sys",
     "examples/basic"
-]
+]
+

examples/basic/Cargo.toml

@@ -11,3 +11,4 @@ tokio = { version = "1.36.0", features = ["full"] }
 tokio-util = { version = "0.7.10", features = ["rt"] }
 waku = { path = "../../waku-bindings", package = "waku-bindings" }
 serde_json = "1.0"
+compiler_builtins = { version = "0.1", features = ["mem"] }

examples/tic-tac-toe-gui/Cargo.toml

@@ -14,4 +14,5 @@ tokio-util = "0.6"  # for utility functions if needed
 egui = "0.22"
 eframe = "0.22"
 secp256k1 = { version = "0.26", features = ["rand", "recovery", "serde"] }
+compiler_builtins = { version = "0.1", features = ["mem"] }
 

examples/tic-tac-toe-gui/src/main.rs

@@ -345,6 +345,7 @@ async fn main() -> eframe::Result<()> {
         tcp_port: Some(60010),
         cluster_id: Some(16),
         shards: vec![1, 32, 64, 128, 256],
+        num_shards_in_network: Some(257),
         // node_key: Some(SecretKey::from_str("2fc0515879e52b7b73297cfd6ab3abf7c344ef84b7a90ff6f4cc19e05a198027").unwrap()),
         max_message_size: Some("1024KiB".to_string()),
         relay_topics: vec![String::from(&game_topic)],

examples/toy-chat/Cargo.toml

@@ -16,4 +16,5 @@ crossterm = "0.25"
 unicode-width = "0.1"
 prost = "0.11"
 chrono = "0.4"
-tokio = { version = "1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
+compiler_builtins = { version = "0.1", features = ["mem"] }

examples/toy-chat/src/main.rs

@@ -55,6 +55,7 @@ impl App<Initialized> {
             tcp_port: Some(60010),
             cluster_id: Some(16),
             shards: vec![1, 32, 64, 128, 256],
+            num_shards_in_network: Some(257),
             // node_key: Some(SecretKey::from_str("2fc0515879e52b7b73297cfd6ab3abf7c344ef84b7a90ff6f4cc19e05a198027").unwrap()),
             max_message_size: Some("1024KiB".to_string()),
             relay_topics: vec![String::from(&pubsub_topic)],

waku-bindings/Cargo.toml

@@ -15,6 +15,7 @@ categories = ["network-programming"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
+compiler_builtins = { version = "0.1", features = ["mem"] }
 aes-gcm = { version = "0.10", features = ["aes"] }
 base64 = "0.21"
 enr = { version = "0.7", features = ["serde", "rust-secp256k1"] }

waku-bindings/src/node/config.rs

@@ -28,8 +28,11 @@ pub struct WakuNodeConfig {
     #[default(Some(true))]
     pub relay: Option<bool>,
     pub relay_topics: Vec<String>,
-    #[default(vec![1])]
+    #[default(vec![0])]
     pub shards: Vec<usize>,
+    #[default(Some(1))]
+    #[serde(rename = "numShardsInNetwork")]
+    pub num_shards_in_network: Option<usize>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub max_message_size: Option<String>,
 

waku-sys/Cargo.toml

@@ -32,6 +32,7 @@ crate-type = ["rlib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
+compiler_builtins = { version = "0.1", features = ["mem"] }
 
 [build-dependencies]
 bindgen = "0.64"