diff --git a/vendor/nim-confutils b/vendor/nim-confutils
index 0435e6783..05a438414 160000
--- a/vendor/nim-confutils
+++ b/vendor/nim-confutils
@@ -1 +1 @@
-Subproject commit 0435e67832b6bb8dfdf0ddb102903e9d820206d2
+Subproject commit 05a438414a91ae6729c6f1966358909840368e0c
diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams
index 03975dadf..37a183153 160000
--- a/vendor/nim-faststreams
+++ b/vendor/nim-faststreams
@@ -1 +1 @@
-Subproject commit 03975dadf6fedb8beb5d1b4d4c5bec8635fd7577
+Subproject commit 37a183153c071539ab870f427c09a1376ba311b9
diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc
index 5a2817608..ad0c3fb6e 160000
--- a/vendor/nim-json-rpc
+++ b/vendor/nim-json-rpc
@@ -1 +1 @@
-Subproject commit 5a281760803907f4989cacf109b516381dfbbe11
+Subproject commit ad0c3fb6e07bef6a2037637a29ee841d29f9557e
diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization
index 4b8f487d2..a12beabd2 160000
--- a/vendor/nim-json-serialization
+++ b/vendor/nim-json-serialization
@@ -1 +1 @@
-Subproject commit 4b8f487d2dfdd941df7408ceaa70b174cce02180
+Subproject commit a12beabd2fa721407bc99492a0075ce43ad9994d
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 07da14a7a..44a7260f0 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 07da14a7a7de467b9d5cfe46eeaba18c8de7a7e0
+Subproject commit 44a7260f0754341a6ae9864d4ece5a177cb8fc2b
diff --git a/vendor/nim-metrics b/vendor/nim-metrics
index 71e0f0e35..858f73b7d 160000
--- a/vendor/nim-metrics
+++ b/vendor/nim-metrics
@@ -1 +1 @@
-Subproject commit 71e0f0e354e1f4c59e3dc92153989c8b723c3440
+Subproject commit 858f73b7d3ae992333a7ffab35da87e3b7b81356
diff --git a/vendor/nim-stew b/vendor/nim-stew
index b464505b4..bb705bf17 160000
--- a/vendor/nim-stew
+++ b/vendor/nim-stew
@@ -1 +1 @@
-Subproject commit b464505b4dcbe2ef52d19b2cfca8f2be4ebf2c7e
+Subproject commit bb705bf17b46d2c8f9bfb106d9cc7437009a2501
diff --git a/vendor/nim-stint b/vendor/nim-stint
index ddfa6c608..e656ad40d 160000
--- a/vendor/nim-stint
+++ b/vendor/nim-stint
@@ -1 +1 @@
-Subproject commit ddfa6c608a6c2a843d7b405f377a22703947267a
+Subproject commit e656ad40d1815f618c12c7636a37e6971959aa62
diff --git a/vendor/nim-web3 b/vendor/nim-web3
index 0f82cf22f..91c998a0d 160000
--- a/vendor/nim-web3
+++ b/vendor/nim-web3
@@ -1 +1 @@
-Subproject commit 0f82cf22f37fecd6dedf838c0c592c33d0748ab4
+Subproject commit 91c998a0d488cef011e84d8a1ef3d4f83d963111
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index bc4791418..8425ff9e3 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit bc4791418a3d748c6114e7219d95739ad154ecaa
+Subproject commit 8425ff9e3b6adb83e226d408a5d06d31ac2a7789
diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index f75f0a481..4d822aef9 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -669,12 +669,12 @@ proc mountRelay*(node: WakuNode,
   # @TODO: Better error handling: CatchableError is raised by `waitFor`
   {.gcsafe, raises: [Defect, InitializationError, LPError, CatchableError].} =
 
-  func msgIdProvider(m: messages.Message): seq[byte] =
+  proc msgIdProvider(m: messages.Message): Result[MessageID, ValidationResult] =
     let mh = MultiHash.digest("sha2-256", m.data)
     if mh.isOk():
-      return mh[].data.buffer
+      return ok(mh[].data.buffer)
     else:
-      return ($m.data.hash).toBytes()
+      return ok(($m.data.hash).toBytes())
 
   let wakuRelay = WakuRelay.init(
     switch = node.switch,