diff --git a/nimble.lock b/nimble.lock
index 318861754..93d21992f 100644
--- a/nimble.lock
+++ b/nimble.lock
@@ -1,6 +1,131 @@
 {
   "version": 2,
   "packages": {
+    "npeg": {
+      "version": "1.3.0",
+      "vcsRevision": "409f6796d0e880b3f0222c964d1da7de6e450811",
+      "url": "https://github.com/zevv/npeg",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "64f15c85a059c889cb11c5fe72372677c50da621"
+      }
+    },
+    "results": {
+      "version": "0.5.1",
+      "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
+      "url": "https://github.com/arnetheduck/nim-results",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "a9c011f74bc9ed5c91103917b9f382b12e82a9e7"
+      }
+    },
+    "unittest2": {
+      "version": "0.2.5",
+      "vcsRevision": "26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189",
+      "url": "https://github.com/status-im/nim-unittest2.git",
+      "downloadMethod": "git",
+      "dependencies": [],
+      "checksums": {
+        "sha1": "02bb3751ba9ddc3c17bfd89f2e41cb6bfb8fc0c9"
+      }
+    },
+    "bearssl": {
+      "version": "0.2.8",
+      "vcsRevision": "22c6a76ce015bc07e011562bdcfc51d9446c1e82",
+      "url": "https://github.com/status-im/nim-bearssl",
+      "downloadMethod": "git",
+      "dependencies": [
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "da4dd7ae96d536bdaf42dca9c85d7aed024b6a86"
+      }
+    },
+    "stew": {
+      "version": "0.5.0",
+      "vcsRevision": "4382b18f04b3c43c8409bfcd6b62063773b2bbaa",
+      "url": "https://github.com/status-im/nim-stew",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "db22942939773ab7d5a0f2b2668c237240c67dd6"
+      }
+    },
+    "zlib": {
+      "version": "0.2.0",
+      "vcsRevision": "190246aa0bb6569781370964fa2faa474203d6dd",
+      "url": "https://github.com/status-im/nim-zlib",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "results"
+      ],
+      "checksums": {
+        "sha1": "a8c0c569d82315f3ffc1249ab42b0404e84fddc3"
+      }
+    },
+    "httputils": {
+      "version": "0.4.1",
+      "vcsRevision": "f142cb2e8bd812dd002a6493b6082827bb248592",
+      "url": "https://github.com/status-im/nim-http-utils",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "results",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "016774ab31c3afff9a423f7d80584905ee59c570"
+      }
+    },
+    "chronos": {
+      "version": "4.2.2",
+      "vcsRevision": "45f43a9ad8bd8bcf5903b42f365c1c879bd54240",
+      "url": "https://github.com/status-im/nim-chronos",
+      "downloadMethod": "git",
+      "dependencies": [
+        "results",
+        "stew",
+        "bearssl",
+        "httputils",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "3a4c9477df8cef20a04e4f1b54a2d74fdfc2a3d0"
+      }
+    },
+    "faststreams": {
+      "version": "0.5.1",
+      "vcsRevision": "50889cd16ec8771106cdd0eeea460039e8571e06",
+      "url": "https://github.com/status-im/nim-faststreams",
+      "downloadMethod": "git",
+      "dependencies": [
+        "stew",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "969ceb3666e807db8fe5c8df63466749822367a9"
+      }
+    },
+    "serialization": {
+      "version": "0.5.2",
+      "vcsRevision": "b0f2fa32960ea532a184394b0f27be37bd80248b",
+      "url": "https://github.com/status-im/nim-serialization",
+      "downloadMethod": "git",
+      "dependencies": [
+        "faststreams",
+        "unittest2",
+        "stew"
+      ],
+      "checksums": {
+        "sha1": "fa35c1bb76a0a02a2379fe86eaae0957c7527cb8"
+      }
+    },
     "nim": {
       "version": "2.2.10",
       "vcsRevision": "9fe2137fa2f3f66cf5a44f357d461829ac9e20c4",
@@ -11,53 +136,61 @@
         "sha1": "17ec440fdb89f8903db29a17898af590087d2b64"
       }
     },
+    "testutils": {
+      "version": "0.8.1",
+      "vcsRevision": "6ce5e5e2301ccbc04b09d27ff78741ff4d352b4d",
+      "url": "https://github.com/status-im/nim-testutils",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "96a11cf8b84fa9bd12d4a553afa1cc4b7f9df4e3"
+      }
+    },
+    "protobuf_serialization": {
+      "version": "#ce97ba0a7376df298552f05559110979a63ec9a4",
+      "vcsRevision": "ce97ba0a7376df298552f05559110979a63ec9a4",
+      "url": "https://github.com/status-im/nim-protobuf-serialization.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "stew",
+        "faststreams",
+        "serialization",
+        "npeg",
+        "unittest2"
+      ],
+      "checksums": {
+        "sha1": "cc9dcddc1628b284716923cfce801cffc85d9e9c"
+      }
+    },
     "boringssl": {
-      "version": "0.0.7",
-      "vcsRevision": "e7aefd8714f60ab30f0835d6f6dd90bd62114152",
+      "version": "0.0.8",
+      "vcsRevision": "e77caabae78fbc9aa5b78a0a521181b077c82571",
       "url": "https://github.com/vacp2p/nim-boringssl",
       "downloadMethod": "git",
       "dependencies": [
         "nim"
       ],
       "checksums": {
-        "sha1": "7101beb2ec0ee45b277d2bf726c9b48f343b4573"
+        "sha1": "2f603bb6d70683393bbb091bf6bd325d9c52be9f"
       }
     },
-    "npeg": {
-      "version": "1.3.0",
-      "vcsRevision": "409f6796d0e880b3f0222c964d1da7de6e450811",
-      "url": "https://github.com/zevv/npeg",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim"
-      ],
-      "checksums": {
-        "sha1": "64f15c85a059c889cb11c5fe72372677c50da621"
-      }
-    },
-    "results": {
-      "version": "0.5.1",
-      "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27",
-      "url": "https://github.com/arnetheduck/nim-results",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim"
-      ],
-      "checksums": {
-        "sha1": "a9c011f74bc9ed5c91103917b9f382b12e82a9e7"
-      }
-    },
-    "nat_traversal": {
-      "version": "0.0.1",
-      "vcsRevision": "860e18c37667b5dd005b94c63264560c35d88004",
-      "url": "https://github.com/status-im/nim-nat-traversal",
+    "toml_serialization": {
+      "version": "0.2.18",
+      "vcsRevision": "b5b387e6fb2a7cc75d54a269b07cc6218361bd46",
+      "url": "https://github.com/status-im/nim-toml-serialization",
       "downloadMethod": "git",
       "dependencies": [
         "nim",
-        "results"
+        "faststreams",
+        "serialization",
+        "stew"
       ],
       "checksums": {
-        "sha1": "1a376d3e710590ef2c48748a546369755f0a7c97"
+        "sha1": "76ae1c2af5dd092849b41750ff29217980dc9ca3"
       }
     },
     "unicodedb": {
@@ -85,44 +218,6 @@
         "sha1": "4d24e7d7441137cd202e16f2359a5807ddbdc31f"
       }
     },
-    "unittest2": {
-      "version": "0.2.5",
-      "vcsRevision": "26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189",
-      "url": "https://github.com/status-im/nim-unittest2.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim"
-      ],
-      "checksums": {
-        "sha1": "02bb3751ba9ddc3c17bfd89f2e41cb6bfb8fc0c9"
-      }
-    },
-    "testutils": {
-      "version": "0.8.1",
-      "vcsRevision": "6ce5e5e2301ccbc04b09d27ff78741ff4d352b4d",
-      "url": "https://github.com/status-im/nim-testutils",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "96a11cf8b84fa9bd12d4a553afa1cc4b7f9df4e3"
-      }
-    },
-    "bearssl": {
-      "version": "0.2.8",
-      "vcsRevision": "22c6a76ce015bc07e011562bdcfc51d9446c1e82",
-      "url": "https://github.com/status-im/nim-bearssl",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "da4dd7ae96d536bdaf42dca9c85d7aed024b6a86"
-      }
-    },
     "bearssl_pkey_decoder": {
       "version": "#d34aa46bf9d0a3ffff810fbd3c4d2fa024eb9368",
       "vcsRevision": "d34aa46bf9d0a3ffff810fbd3c4d2fa024eb9368",
@@ -150,64 +245,68 @@
         "sha1": "3cd368666fd2bc7f99f253452289e827abcac13c"
       }
     },
-    "stew": {
-      "version": "0.5.0",
-      "vcsRevision": "4382b18f04b3c43c8409bfcd6b62063773b2bbaa",
-      "url": "https://github.com/status-im/nim-stew",
+    "nat_traversal": {
+      "version": "0.0.1",
+      "vcsRevision": "860e18c37667b5dd005b94c63264560c35d88004",
+      "url": "https://github.com/status-im/nim-nat-traversal",
       "downloadMethod": "git",
       "dependencies": [
         "nim",
-        "results",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "db22942939773ab7d5a0f2b2668c237240c67dd6"
-      }
-    },
-    "zlib": {
-      "version": "0.2.0",
-      "vcsRevision": "190246aa0bb6569781370964fa2faa474203d6dd",
-      "url": "https://github.com/status-im/nim-zlib",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim",
-        "stew",
         "results"
       ],
       "checksums": {
-        "sha1": "a8c0c569d82315f3ffc1249ab42b0404e84fddc3"
+        "sha1": "1a376d3e710590ef2c48748a546369755f0a7c97"
       }
     },
-    "httputils": {
-      "version": "0.4.1",
-      "vcsRevision": "f142cb2e8bd812dd002a6493b6082827bb248592",
-      "url": "https://github.com/status-im/nim-http-utils",
+    "db_connector": {
+      "version": "0.1.0",
+      "vcsRevision": "29450a2063970712422e1ab857695c12d80112a6",
+      "url": "https://github.com/nim-lang/db_connector",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim"
+      ],
+      "checksums": {
+        "sha1": "4f2e67d0e4b61af9ac5575509305660b473f01a4"
+      }
+    },
+    "sqlite3_abi": {
+      "version": "3.53.2.0",
+      "vcsRevision": "ec5f6de2e2f214380095b3095dab0726b6e411fd",
+      "url": "https://github.com/arnetheduck/nim-sqlite3-abi",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim"
+      ],
+      "checksums": {
+        "sha1": "858e09d91a55639a1a6ae4b6111eb67e74544268"
+      }
+    },
+    "dnsclient": {
+      "version": "0.3.4",
+      "vcsRevision": "23214235d4784d24aceed99bbfe153379ea557c8",
+      "url": "https://github.com/ba0f3/dnsclient.nim",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim"
+      ],
+      "checksums": {
+        "sha1": "65262c7e533ff49d6aca5539da4bc6c6ce132f40"
+      }
+    },
+    "confutils": {
+      "version": "0.1.0",
+      "vcsRevision": "36f3115ca350f40841ac0eecc7dfa5fe7790c864",
+      "url": "https://github.com/status-im/nim-confutils",
       "downloadMethod": "git",
       "dependencies": [
         "nim",
         "stew",
-        "results",
-        "unittest2"
+        "serialization",
+        "results"
       ],
       "checksums": {
-        "sha1": "016774ab31c3afff9a423f7d80584905ee59c570"
-      }
-    },
-    "chronos": {
-      "version": "4.2.2",
-      "vcsRevision": "45f43a9ad8bd8bcf5903b42f365c1c879bd54240",
-      "url": "https://github.com/status-im/nim-chronos",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim",
-        "results",
-        "stew",
-        "bearssl",
-        "httputils",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "3a4c9477df8cef20a04e4f1b54a2d74fdfc2a3d0"
+        "sha1": "2fbe6418ddd9f79fb11a0addd7666a3e787adbe0"
       }
     },
     "metrics": {
@@ -225,10 +324,10 @@
         "sha1": "84bb09873d7677c06046f391c7b473cd2fcff8a2"
       }
     },
-    "faststreams": {
-      "version": "0.5.1",
-      "vcsRevision": "50889cd16ec8771106cdd0eeea460039e8571e06",
-      "url": "https://github.com/status-im/nim-faststreams",
+    "stint": {
+      "version": "0.8.2",
+      "vcsRevision": "470b7892561b5179ab20bd389a69217d6213fe58",
+      "url": "https://github.com/status-im/nim-stint",
       "downloadMethod": "git",
       "dependencies": [
         "nim",
@@ -236,85 +335,22 @@
         "unittest2"
       ],
       "checksums": {
-        "sha1": "969ceb3666e807db8fe5c8df63466749822367a9"
+        "sha1": "d8f871fd617e7857192d4609fe003b48942a8ae5"
       }
     },
-    "snappy": {
-      "version": "0.1.0",
-      "vcsRevision": "00bfcef94f8ef6981df5d5b994897f6695badfb2",
-      "url": "https://github.com/status-im/nim-snappy",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim",
-        "faststreams",
-        "unittest2",
-        "results",
-        "stew"
-      ],
-      "checksums": {
-        "sha1": "e572d60d6a3178c5b1cde2400c51ad771812cd3d"
-      }
-    },
-    "serialization": {
-      "version": "0.5.2",
-      "vcsRevision": "b0f2fa32960ea532a184394b0f27be37bd80248b",
-      "url": "https://github.com/status-im/nim-serialization",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim",
-        "faststreams",
-        "unittest2",
-        "stew"
-      ],
-      "checksums": {
-        "sha1": "fa35c1bb76a0a02a2379fe86eaae0957c7527cb8"
-      }
-    },
-    "protobuf_serialization": {
-      "version": "#46753f2b90365035bc0f75c6894e160c35880be1",
-      "vcsRevision": "46753f2b90365035bc0f75c6894e160c35880be1",
-      "url": "https://github.com/status-im/nim-protobuf-serialization",
+    "cbor_serialization": {
+      "version": "0.3.0",
+      "vcsRevision": "1664160e04d153573373afddc552b9cbf6fbe4dc",
+      "url": "https://github.com/vacp2p/nim-cbor-serialization",
       "downloadMethod": "git",
       "dependencies": [
         "nim",
+        "serialization",
         "stew",
-        "faststreams",
-        "serialization",
-        "npeg",
-        "unittest2"
-      ],
-      "checksums": {
-        "sha1": "ffbf57f6424211a18ec77d5789c102a5e4b2ac5d"
-      }
-    },
-    "toml_serialization": {
-      "version": "0.2.18",
-      "vcsRevision": "b5b387e6fb2a7cc75d54a269b07cc6218361bd46",
-      "url": "https://github.com/status-im/nim-toml-serialization",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim",
-        "faststreams",
-        "serialization",
-        "stew"
-      ],
-      "checksums": {
-        "sha1": "76ae1c2af5dd092849b41750ff29217980dc9ca3"
-      }
-    },
-    "confutils": {
-      "version": "0.1.0",
-      "vcsRevision": "36f3115ca350f40841ac0eecc7dfa5fe7790c864",
-      "url": "https://github.com/status-im/nim-confutils",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim",
-        "stew",
-        "serialization",
         "results"
       ],
       "checksums": {
-        "sha1": "2fbe6418ddd9f79fb11a0addd7666a3e787adbe0"
+        "sha1": "ab126eae09a6e39c72972a6a0b83cb06a2ffe8f0"
       }
     },
     "json_serialization": {
@@ -339,7 +375,6 @@
       "url": "https://github.com/status-im/nim-chronicles",
       "downloadMethod": "git",
       "dependencies": [
-        "nim",
         "faststreams",
         "serialization",
         "json_serialization",
@@ -366,18 +401,32 @@
         "sha1": "8df97c45683abe2337bdff43b844c4fbcc124ca2"
       }
     },
-    "stint": {
-      "version": "0.8.2",
-      "vcsRevision": "470b7892561b5179ab20bd389a69217d6213fe58",
-      "url": "https://github.com/status-im/nim-stint",
+    "taskpools": {
+      "version": "0.1.0",
+      "vcsRevision": "9e8ccc754631ac55ac2fd495e167e74e86293edb",
+      "url": "https://github.com/status-im/nim-taskpools",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim"
+      ],
+      "checksums": {
+        "sha1": "09e1b2fdad55b973724d61227971afc0df0b7a81"
+      }
+    },
+    "ffi": {
+      "version": "0.2.0",
+      "vcsRevision": "721f244312249b1b9e5ff8a19eaca584fd7d6165",
+      "url": "https://github.com/logos-messaging/nim-ffi",
       "downloadMethod": "git",
       "dependencies": [
         "nim",
-        "stew",
-        "unittest2"
+        "chronos",
+        "chronicles",
+        "taskpools",
+        "cbor_serialization"
       ],
       "checksums": {
-        "sha1": "d8f871fd617e7857192d4609fe003b48942a8ae5"
+        "sha1": "849c18f96b2439738c86c75f6c77bac8084354ec"
       }
     },
     "minilru": {
@@ -394,40 +443,20 @@
         "sha1": "0be03a5da29fdd4409ea74a60fd0ccce882601b4"
       }
     },
-    "db_connector": {
+    "snappy": {
       "version": "0.1.0",
-      "vcsRevision": "29450a2063970712422e1ab857695c12d80112a6",
-      "url": "https://github.com/nim-lang/db_connector",
+      "vcsRevision": "00bfcef94f8ef6981df5d5b994897f6695badfb2",
+      "url": "https://github.com/status-im/nim-snappy",
       "downloadMethod": "git",
       "dependencies": [
-        "nim"
+        "nim",
+        "faststreams",
+        "unittest2",
+        "results",
+        "stew"
       ],
       "checksums": {
-        "sha1": "4f2e67d0e4b61af9ac5575509305660b473f01a4"
-      }
-    },
-    "sqlite3_abi": {
-      "version": "3.53.1.0",
-      "vcsRevision": "8f9f2dbacb7408bb0b70857ca6aa882bd75624e0",
-      "url": "https://github.com/arnetheduck/nim-sqlite3-abi",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim"
-      ],
-      "checksums": {
-        "sha1": "9a274fac03e83d33e31f67174cfed5ff6035d325"
-      }
-    },
-    "dnsclient": {
-      "version": "0.3.4",
-      "vcsRevision": "23214235d4784d24aceed99bbfe153379ea557c8",
-      "url": "https://github.com/ba0f3/dnsclient.nim",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim"
-      ],
-      "checksums": {
-        "sha1": "65262c7e533ff49d6aca5539da4bc6c6ce132f40"
+        "sha1": "e572d60d6a3178c5b1cde2400c51ad771812cd3d"
       }
     },
     "nimcrypto": {
@@ -435,16 +464,14 @@
       "vcsRevision": "721fb99ee099b632eb86dfad1f0d96ee87583774",
       "url": "https://github.com/cheatfate/nimcrypto",
       "downloadMethod": "git",
-      "dependencies": [
-        "nim"
-      ],
+      "dependencies": [],
       "checksums": {
         "sha1": "f9ab24fa940ed03d0fb09729a7303feb50b7eaec"
       }
     },
     "lsquic": {
-      "version": "0.4.2",
-      "vcsRevision": "d911ab827dfb9397dcee644ee01295a6de0cd315",
+      "version": "0.5.1",
+      "vcsRevision": "2f01046bf1d513de8b5f8296c3d8bec819ab0cb9",
       "url": "https://github.com/vacp2p/nim-lsquic",
       "downloadMethod": "git",
       "dependencies": [
@@ -458,7 +485,7 @@
         "https://github.com/vacp2p/nim-boringssl"
       ],
       "checksums": {
-        "sha1": "cfbfe63f53be8ee2020317dba2aeeff13c6ed3b3"
+        "sha1": "959df1a9ac2a574d6fe30a4faf37c37b443e1cfb"
       }
     },
     "websock": {
@@ -519,14 +546,13 @@
       }
     },
     "libp2p": {
-      "version": "#d4cd68b91b82f34a0ede3766ab1ca8119d5015f8",
-      "vcsRevision": "d4cd68b91b82f34a0ede3766ab1ca8119d5015f8",
-      "url": "https://github.com/vacp2p/nim-libp2p.git",
+      "version": "#f54c7150a7ccbc4e9871bb8b56ecfd7e3e59f7de",
+      "vcsRevision": "f54c7150a7ccbc4e9871bb8b56ecfd7e3e59f7de",
+      "url": "https://github.com/vacp2p/nim-libp2p",
       "downloadMethod": "git",
       "dependencies": [
         "nim",
         "nimcrypto",
-        "dnsclient",
         "bearssl",
         "https://github.com/vacp2p/nim-boringssl",
         "chronicles",
@@ -538,12 +564,32 @@
         "results",
         "serialization",
         "lsquic",
+        "protobuf_serialization",
         "websock",
-        "jwt",
-        "protobuf_serialization"
+        "nat_traversal"
       ],
       "checksums": {
-        "sha1": "609e3c843d1f64334abd1899e5a94ba4207dcbdf"
+        "sha1": "461c4e7c7174031322726b9d9205fc9cbe8991bf"
+      }
+    },
+    "sds": {
+      "version": "#2e9a7683f0e180bf112135fae3a3803eed8490d4",
+      "vcsRevision": "49e4505a6b9204f774e8791ab52b379dbad3dc23",
+      "url": "https://github.com/logos-messaging/nim-sds.git",
+      "downloadMethod": "git",
+      "dependencies": [
+        "nim",
+        "chronos",
+        "libp2p",
+        "chronicles",
+        "stew",
+        "stint",
+        "metrics",
+        "results",
+        "taskpools"
+      ],
+      "checksums": {
+        "sha1": "d13f1bf8d1b90b27e9edfc063b043831242cda19"
       }
     },
     "libp2p_mix": {
@@ -638,53 +684,6 @@
       "checksums": {
         "sha1": "6451cab35990f334a46927f49f9176579460934d"
       }
-    },
-    "taskpools": {
-      "version": "0.1.0",
-      "vcsRevision": "9e8ccc754631ac55ac2fd495e167e74e86293edb",
-      "url": "https://github.com/status-im/nim-taskpools",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim"
-      ],
-      "checksums": {
-        "sha1": "09e1b2fdad55b973724d61227971afc0df0b7a81"
-      }
-    },
-    "ffi": {
-      "version": "0.1.3",
-      "vcsRevision": "06111de155253b34e47ed2aaed1d61d08d62cc1b",
-      "url": "https://github.com/logos-messaging/nim-ffi",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim",
-        "chronos",
-        "chronicles",
-        "taskpools"
-      ],
-      "checksums": {
-        "sha1": "6f9d49375ea1dc71add55c72ac80a808f238e5b0"
-      }
-    },
-    "sds": {
-      "version": "#2e9a7683f0e180bf112135fae3a3803eed8490d4",
-      "vcsRevision": "9cee683d95aee34ebc02c1a473b71dd2d9a8c98f",
-      "url": "https://github.com/logos-messaging/nim-sds.git",
-      "downloadMethod": "git",
-      "dependencies": [
-        "nim",
-        "chronos",
-        "libp2p",
-        "chronicles",
-        "stew",
-        "stint",
-        "metrics",
-        "results",
-        "taskpools"
-      ],
-      "checksums": {
-        "sha1": "d13f1bf8d1b90b27e9edfc063b043831242cda19"
-      }
     }
   },
   "tasks": {}
diff --git a/nix/deps.nix b/nix/deps.nix
index 0d9986528..5d8c90cb5 100644
--- a/nix/deps.nix
+++ b/nix/deps.nix
@@ -250,8 +250,8 @@
 
   libp2p = pkgs.fetchgit {
     url = "https://github.com/vacp2p/nim-libp2p.git";
-    rev = "ff8d51857b4b79a68468e7bcc27b2026cca02996";
-    sha256 = "08y4s0zhqzsd780bwaixfqbi79km0mcq5g8nyw7awfvcbjqsa53l";
+    rev = "f54c7150a7ccbc4e9871bb8b56ecfd7e3e59f7de";
+    sha256 = "sha256-KgsJUBNkw8n7muFiJ29Xyy8KXv6kto1p8VR0eyLBmgk=";
     fetchSubmodules = true;
   };
 
diff --git a/waku.nimble b/waku.nimble
index 9c526ea1a..aa8271375 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -25,15 +25,16 @@ requires "nim >= 2.2.4",
   "serialization",
   "json_serialization",
   "toml_serialization",
+  "https://github.com/status-im/nim-protobuf-serialization.git#ce97ba0a7376df298552f05559110979a63ec9a4",
   "faststreams",
   # Networking & P2P
-  "https://github.com/vacp2p/nim-libp2p.git#d4cd68b91b82f34a0ede3766ab1ca8119d5015f8",
+  "https://github.com/vacp2p/nim-libp2p.git#f54c7150a7ccbc4e9871bb8b56ecfd7e3e59f7de",
   "eth",
   "nat_traversal",
   "dnsdisc",
   "dnsclient",
   "httputils >= 0.4.1",
-  "https://github.com/status-im/nim-websock#42c37b4172519566db016810eccfce8a02cc1cdf",
+  "https://github.com/status-im/nim-websock.git#fb8ba71fefdfb3e8466f65a37e10964c85a000cc",
   # Cryptography
   "nimcrypto == 0.6.4", # 0.6.4 used in libp2p. Version 0.7.3 makes test to crash on Ubuntu.
   "secp256k1",
@@ -61,6 +62,7 @@ requires "nim >= 2.2.4",
 # Packages not on nimble (use git URLs)
 requires "https://github.com/logos-messaging/nim-ffi"
 requires "https://github.com/logos-co/nim-libp2p-mix.git#6c5f43ae715443dc72048a12b0ea3afc06f0fa2b"
+requires "https://github.com/status-im/nim-websock.git#fb8ba71fefdfb3e8466f65a37e10964c85a000cc"
 
 requires "https://github.com/logos-messaging/nim-sds.git#2e9a7683f0e180bf112135fae3a3803eed8490d4"
 
diff --git a/waku/common/rate_limit/request_limiter.nim b/waku/common/rate_limit/request_limiter.nim
index bc318e151..56c4b925b 100644
--- a/waku/common/rate_limit/request_limiter.nim
+++ b/waku/common/rate_limit/request_limiter.nim
@@ -20,7 +20,7 @@ import
   chronicles,
   chronos/timer,
   libp2p/stream/connection,
-  libp2p/utility
+  libp2p/utils/opt
 
 import std/times except TimeInterval, Duration, seconds, minutes
 
diff --git a/waku/common/rate_limit/single_token_limiter.nim b/waku/common/rate_limit/single_token_limiter.nim
index fc4b0acd5..5b781c988 100644
--- a/waku/common/rate_limit/single_token_limiter.nim
+++ b/waku/common/rate_limit/single_token_limiter.nim
@@ -2,7 +2,7 @@
 
 {.push raises: [].}
 
-import std/[options], chronos/timer, libp2p/stream/connection, libp2p/utility
+import std/[options], chronos/timer, libp2p/stream/connection, libp2p/utils/opt
 
 import std/times except TimeInterval, Duration
 
diff --git a/waku/common/rate_limit/timed_map.nim b/waku/common/rate_limit/timed_map.nim
index b9a5c4cbf..13d6c85b1 100644
--- a/waku/common/rate_limit/timed_map.nim
+++ b/waku/common/rate_limit/timed_map.nim
@@ -14,7 +14,7 @@
 
 import std/[hashes, sets]
 import chronos/timer, results
-import libp2p/utility
+import libp2p/utils/opt
 
 export results
 
diff --git a/waku/discovery/waku_kademlia.nim b/waku/discovery/waku_kademlia.nim
index 5690c45e8..69cf72a5a 100644
--- a/waku/discovery/waku_kademlia.nim
+++ b/waku/discovery/waku_kademlia.nim
@@ -7,7 +7,6 @@ import
   results,
   libp2p/crypto/curve25519,
   libp2p/crypto/crypto,
-  libp2p_mix/mix_protocol,
   libp2p/[peerid, multiaddress, switch],
   libp2p/extended_peer_record,
   libp2p/protocols/[kademlia, service_discovery],
@@ -42,7 +41,7 @@ proc toRemotePeerInfo(record: ExtendedPeerRecord): Option[RemotePeerInfo] =
 
   var mixPubKey = none(Curve25519Key)
   for service in record.services:
-    if service.id != MixProtocolID:
+    if service.id != "/mix/1.0.0":
       continue
 
     if service.data.len != Curve25519KeySize:
diff --git a/waku/node/delivery_service/recv_service/recv_service.nim b/waku/node/delivery_service/recv_service/recv_service.nim
index 64f4d683d..df8c2f29e 100644
--- a/waku/node/delivery_service/recv_service/recv_service.nim
+++ b/waku/node/delivery_service/recv_service/recv_service.nim
@@ -3,7 +3,7 @@
 ##
 
 import std/[tables, sequtils, options, sets]
-import chronos, chronicles, libp2p/utility
+import chronos, chronicles, libp2p/utils/opt
 import ../[subscription_manager]
 import
   waku/[
diff --git a/waku/node/delivery_service/send_service/send_service.nim b/waku/node/delivery_service/send_service/send_service.nim
index a3c44bc0c..653410875 100644
--- a/waku/node/delivery_service/send_service/send_service.nim
+++ b/waku/node/delivery_service/send_service/send_service.nim
@@ -2,7 +2,7 @@
 ##
 
 import std/[sequtils, tables, options]
-import chronos, chronicles, libp2p/utility
+import chronos, chronicles, libp2p/utils/opt
 import
   ./[send_processor, relay_processor, lightpush_processor, delivery_task],
   ../[subscription_manager],
diff --git a/waku/node/kernel_api/filter.nim b/waku/node/kernel_api/filter.nim
index 948035f14..20fd6ae8e 100644
--- a/waku/node/kernel_api/filter.nim
+++ b/waku/node/kernel_api/filter.nim
@@ -17,7 +17,7 @@ import
   libp2p/builders,
   libp2p/transports/tcptransport,
   libp2p/transports/wstransport,
-  libp2p/utility
+  libp2p/utils/opt
 
 import
   ../waku_node,
diff --git a/waku/node/kernel_api/lightpush.nim b/waku/node/kernel_api/lightpush.nim
index b3ef68eba..38b8c65ac 100644
--- a/waku/node/kernel_api/lightpush.nim
+++ b/waku/node/kernel_api/lightpush.nim
@@ -16,7 +16,7 @@ import
   libp2p/builders,
   libp2p/transports/tcptransport,
   libp2p/transports/wstransport,
-  libp2p/utility,
+  libp2p/utils/opt,
   libp2p_mix
 
 import
diff --git a/waku/node/kernel_api/peer_exchange.nim b/waku/node/kernel_api/peer_exchange.nim
index a4bec727b..fb43bcb37 100644
--- a/waku/node/kernel_api/peer_exchange.nim
+++ b/waku/node/kernel_api/peer_exchange.nim
@@ -15,7 +15,7 @@ import
   libp2p/builders,
   libp2p/transports/tcptransport,
   libp2p/transports/wstransport,
-  libp2p/utility
+  libp2p/utils/opt
 
 import
   ../waku_node,
diff --git a/waku/node/kernel_api/ping.nim b/waku/node/kernel_api/ping.nim
index 9dc649fd8..2d13288b1 100644
--- a/waku/node/kernel_api/ping.nim
+++ b/waku/node/kernel_api/ping.nim
@@ -9,7 +9,7 @@ import
   libp2p/protocols/ping,
   libp2p/builders,
   libp2p/transports/tcptransport,
-  libp2p/utility
+  libp2p/utils/opt
 
 import ../waku_node, ../peer_manager
 
diff --git a/waku/node/kernel_api/relay.nim b/waku/node/kernel_api/relay.nim
index fe46f5bd2..c1cf8eda7 100644
--- a/waku/node/kernel_api/relay.nim
+++ b/waku/node/kernel_api/relay.nim
@@ -16,7 +16,7 @@ import
   libp2p/builders,
   libp2p/transports/tcptransport,
   libp2p/transports/wstransport,
-  libp2p/utility
+  libp2p/utils/opt
 
 import
   waku/[
diff --git a/waku/node/kernel_api/store.nim b/waku/node/kernel_api/store.nim
index fcf0dfc89..5a91426d7 100644
--- a/waku/node/kernel_api/store.nim
+++ b/waku/node/kernel_api/store.nim
@@ -15,7 +15,7 @@ import
   libp2p/builders,
   libp2p/transports/tcptransport,
   libp2p/transports/wstransport,
-  libp2p/utility
+  libp2p/utils/opt
 
 import
   ../waku_node,
diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
index 473b98d4d..c6989d9ed 100644
--- a/waku/node/waku_node.nim
+++ b/waku/node/waku_node.nim
@@ -20,7 +20,6 @@ import
   libp2p/transports/transport,
   libp2p/transports/tcptransport,
   libp2p/transports/wstransport,
-  libp2p/utility,
   libp2p/utils/offsettedseq,
   libp2p_mix,
   libp2p_mix/mix_protocol
diff --git a/waku/node/waku_switch.nim b/waku/node/waku_switch.nim
index b043ccedf..3370b3241 100644
--- a/waku/node/waku_switch.nim
+++ b/waku/node/waku_switch.nim
@@ -78,7 +78,7 @@ proc newWakuSwitch*(
     secureCertPath: string = "",
     agentString = none(string), # defaults to nim-libp2p version
     peerStoreCapacity = none(int), # defaults to 1.25 maxConnections
-    rendezvous: RendezVousConfig = nil,
+    rendezvous: RendezVousConfig = default(RendezVousConfig),
     circuitRelay: Relay,
     maxNumRelays: int = 5,
 ): Switch {.raises: [Defect, IOError, LPError].} =
@@ -94,7 +94,7 @@ proc newWakuSwitch*(
     .withTcpTransport(transportFlags)
     .withNameResolver(nameResolver)
     .withSignedPeerRecord(sendSignedPeerRecord)
-    .withAddressPolicy(publicRoutableAddressPolicy)
+    .withPrivateAddressFilter()
     .withCircuitRelay(circuitRelay)
 
   if peerStoreCapacity.isSome():
@@ -116,7 +116,6 @@ proc newWakuSwitch*(
   else:
     b = b.withAddress(address)
 
-  if not rendezvous.isNil():
-    b = b.withRendezVous(rendezvous)
+  b = b.withRendezVous(rendezvous)
 
   b.build()
diff --git a/waku/waku_noise/noise.nim b/waku/waku_noise/noise.nim
index c8a08468b..b827cd0d5 100644
--- a/waku/waku_noise/noise.nim
+++ b/waku/waku_noise/noise.nim
@@ -16,7 +16,7 @@ import libp2p/crypto/crypto
 import stew/endians2
 import nimcrypto/[sha2, hmac]
 
-import libp2p/utility
+import libp2p/utils/opt
 import libp2p/crypto/[crypto, chacha20poly1305, hkdf]
 import libp2p/protocols/secure/secure
 
diff --git a/waku/waku_rendezvous/protocol.nim b/waku/waku_rendezvous/protocol.nim
index 9d5acb46d..03aef1a76 100644
--- a/waku/waku_rendezvous/protocol.nim
+++ b/waku/waku_rendezvous/protocol.nim
@@ -11,7 +11,7 @@ import
   libp2p/utils/offsettedseq,
   libp2p/crypto/curve25519,
   libp2p/switch,
-  libp2p/utility
+  libp2p/utils/opt
 
 import metrics except collect
 
@@ -158,8 +158,7 @@ proc new*(
     expiredDT: Moment.now() - 1.days,
     sema: newAsyncSemaphore(SemaphoreDefaultSize),
     config: RendezVousConfig.new(
-      minDuration = rendezvous.MinimumDuration,
-      maxDuration = rendezvous.MaximumDuration,
+      minDuration = rendezvous.MinimumDuration, maxDuration = rendezvous.MaximumDuration
     ),
     peerRecordValidator: checkWakuPeerRecord,
   )
diff --git a/waku/waku_store_sync/reconciliation.nim b/waku/waku_store_sync/reconciliation.nim
index b18251fff..03888a217 100644
--- a/waku/waku_store_sync/reconciliation.nim
+++ b/waku/waku_store_sync/reconciliation.nim
@@ -7,7 +7,7 @@ import
   chronicles,
   chronos,
   metrics,
-  libp2p/utility,
+  libp2p/utils/opt,
   libp2p/protocols/protocol,
   libp2p/stream/connection,
   libp2p/crypto/crypto,
diff --git a/waku/waku_store_sync/transfer.nim b/waku/waku_store_sync/transfer.nim
index 5d20afb18..bbf997784 100644
--- a/waku/waku_store_sync/transfer.nim
+++ b/waku/waku_store_sync/transfer.nim
@@ -6,7 +6,7 @@ import
   chronicles,
   chronos,
   metrics,
-  libp2p/utility,
+  libp2p/utils/opt,
   libp2p/protocols/protocol,
   libp2p/stream/connection,
   libp2p/crypto/crypto,