diff --git a/.gitignore b/.gitignore
index 5d53f0ebd..a8ecef543 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@
 
 rln
 *.log
+package-lock.json
+node_modules/
diff --git a/.gitmodules b/.gitmodules
index 7341d7df2..1b005cb05 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,7 +12,7 @@
 	path = vendor/nim-libp2p
 	url = https://github.com/status-im/nim-libp2p.git
 	ignore = dirty
-	branch = unstable
+	branch = master
 [submodule "vendor/nim-stew"]
 	path = vendor/nim-stew
 	url = https://github.com/status-im/nim-stew.git
diff --git a/examples/v1/example.nim b/examples/v1/example.nim
index 7a90d4526..9121adab9 100644
--- a/examples/v1/example.nim
+++ b/examples/v1/example.nim
@@ -33,7 +33,7 @@ let
 # Create Ethereum Node
 var node = newEthereumNode(config.nodekey, # Node identifier
   address, # Address reachable for incoming requests
-  1, # Network Id, only applicable for ETH protocol
+  NetworkId(1), # Network Id, only applicable for ETH protocol
   nil, # Database, not required for Waku
   clientId, # Client id string
   addAllCapabilities = false, # Disable default all RLPx capabilities
diff --git a/tests/test_helpers.nim b/tests/test_helpers.nim
index 23cc9e950..ad745d19c 100644
--- a/tests/test_helpers.nim
+++ b/tests/test_helpers.nim
@@ -15,7 +15,7 @@ proc setupTestNode*(
     rng: ref BrHmacDrbgContext,
     capabilities: varargs[ProtocolInfo, `protocolInfo`]): EthereumNode =
   let keys1 = keys.KeyPair.random(rng[])
-  result = newEthereumNode(keys1, localAddress(nextPort), 1, nil,
+  result = newEthereumNode(keys1, localAddress(nextPort), NetworkId(1), nil,
                            addAllCapabilities = false, rng = rng)
   nextPort.inc
   for capability in capabilities:
diff --git a/tests/v1/test_rpc_waku.nim b/tests/v1/test_rpc_waku.nim
index 02584582e..761a40d4e 100644
--- a/tests/v1/test_rpc_waku.nim
+++ b/tests/v1/test_rpc_waku.nim
@@ -20,7 +20,7 @@ proc setupNode(capabilities: varargs[ProtocolInfo, `protocolInfo`],
     srvAddress = Address(ip: parseIpAddress("0.0.0.0"), tcpPort: Port(30303),
       udpPort: Port(30303))
 
-  result = newEthereumNode(keypair, srvAddress, 1, nil, "waku test rpc",
+  result = newEthereumNode(keypair, srvAddress, NetworkId(1), nil, "waku test rpc",
     addAllCapabilities = false, rng = rng)
   for capability in capabilities:
     result.addCapability capability
diff --git a/tests/v2/test_jsonrpc_waku.nim b/tests/v2/test_jsonrpc_waku.nim
index ead70da12..bc753eb4c 100644
--- a/tests/v2/test_jsonrpc_waku.nim
+++ b/tests/v2/test_jsonrpc_waku.nim
@@ -206,7 +206,7 @@ procSuite "Waku v2 JSON-RPC API":
   asyncTest "Store API: retrieve historical messages":      
     waitFor node.start()
 
-    node.mountRelay(@[defaultTopic])
+    node.mountRelay()
 
     # RPC server setup
     let
@@ -231,6 +231,7 @@ procSuite "Waku v2 JSON-RPC API":
 
     node.wakuStore.setPeer(listenSwitch.peerInfo)
 
+    listenSwitch.mount(node.wakuRelay)
     listenSwitch.mount(node.wakuStore)
 
     var subscriptions = newTable[string, MessageNotificationSubscription]()
diff --git a/vendor/nim-bearssl b/vendor/nim-bearssl
index eebf730cc..0a7401ad4 160000
--- a/vendor/nim-bearssl
+++ b/vendor/nim-bearssl
@@ -1 +1 @@
-Subproject commit eebf730ccda5b5fade2a8f48b3da1496f2c47ba5
+Subproject commit 0a7401ad466d70bab31c5d6dc82d1d584e4ebd1f
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
index c1f6e7276..0b78606e4 160000
--- a/vendor/nim-chronos
+++ b/vendor/nim-chronos
@@ -1 +1 @@
-Subproject commit c1f6e7276e3810cee4bf7358a36a3444fb4bd75e
+Subproject commit 0b78606e4142affbdc0e0e94bc1b8c39a8705737
diff --git a/vendor/nim-eth b/vendor/nim-eth
index 4e58eb48c..be5e088b2 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit 4e58eb48ce1b1a06d28802ad22215de9ff92a916
+Subproject commit be5e088b21e06a85cac4826454412db8459ed4f1
diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams
index 9138f6a8b..99e89eb1e 160000
--- a/vendor/nim-faststreams
+++ b/vendor/nim-faststreams
@@ -1 +1 @@
-Subproject commit 9138f6a8bb9a089790319753895722c2569707b0
+Subproject commit 99e89eb1e5c973ea5162342384408434b7f5715a
diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils
index 1639ac790..422026688 160000
--- a/vendor/nim-http-utils
+++ b/vendor/nim-http-utils
@@ -1 +1 @@
-Subproject commit 1639ac79035c291688174a2037f7d695aa3ff6f3
+Subproject commit 422026688405940a1304d5cdaf68353d93263035
diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc
index ded863fcb..4eb39203e 160000
--- a/vendor/nim-json-rpc
+++ b/vendor/nim-json-rpc
@@ -1 +1 @@
-Subproject commit ded863fcb1741483f285e3bbf27541efdc32c78c
+Subproject commit 4eb39203ebd391c77d16a1c387dc8a6b7d90bc69
diff --git a/vendor/nim-libbacktrace b/vendor/nim-libbacktrace
index 8121c08e0..829a65ca3 160000
--- a/vendor/nim-libbacktrace
+++ b/vendor/nim-libbacktrace
@@ -1 +1 @@
-Subproject commit 8121c08e0e7bdf92f86012b4af2330434fa7ed5d
+Subproject commit 829a65ca3d99c18230598de5d9fc7659f321586c
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 090ea91cb..3bf6acef2 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 090ea91cb06ac6e35fd1401c2214871b24a77363
+Subproject commit 3bf6acef2348162448b1b988a2ba06f0f2e10103
diff --git a/vendor/nim-secp256k1 b/vendor/nim-secp256k1
index ac9605487..67ebdfa80 160000
--- a/vendor/nim-secp256k1
+++ b/vendor/nim-secp256k1
@@ -1 +1 @@
-Subproject commit ac96054870eb7cbc2cf72dd03fe5d5336b2e5dd9
+Subproject commit 67ebdfa8014e1c6011f14d7fc5eb341684eb3b32
diff --git a/vendor/nim-serialization b/vendor/nim-serialization
index 4e2ffe3f6..261de741b 160000
--- a/vendor/nim-serialization
+++ b/vendor/nim-serialization
@@ -1 +1 @@
-Subproject commit 4e2ffe3f6df5b753d7b11fef83cc5ee14f296c1c
+Subproject commit 261de741b73601821cb6e749fc9b4092f1cc5377
diff --git a/vendor/nim-stew b/vendor/nim-stew
index 6d3e6a21c..6bcb21184 160000
--- a/vendor/nim-stew
+++ b/vendor/nim-stew
@@ -1 +1 @@
-Subproject commit 6d3e6a21caf4110d0d432b82f14e41e0271cd76b
+Subproject commit 6bcb21184aeb96ce6c62e187a64d678b74609f1e
diff --git a/vendor/nim-web3 b/vendor/nim-web3
index dde382f70..21b465fcd 160000
--- a/vendor/nim-web3
+++ b/vendor/nim-web3
@@ -1 +1 @@
-Subproject commit dde382f70e811d964a000bdd4d86151615f9d4c0
+Subproject commit 21b465fcd58460e6018dcb1048254f2514696778
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index 9c4c4d3ac..2c1e94d59 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit 9c4c4d3acf8f13e8d973180548837cc738e14aa2
+Subproject commit 2c1e94d595b80a2d247875fe813242bbe6a0ade7
diff --git a/vendor/nimcrypto b/vendor/nimcrypto
index a065c1741..b602bd469 160000
--- a/vendor/nimcrypto
+++ b/vendor/nimcrypto
@@ -1 +1 @@
-Subproject commit a065c1741836462762d18d2fced1fedd46095b02
+Subproject commit b602bd469b66f6968f1d1b474f843a75d1ca6627
diff --git a/waku/common/wakubridge.nim b/waku/common/wakubridge.nim
index 1dc8e9f2a..a97ca5d4a 100644
--- a/waku/common/wakubridge.nim
+++ b/waku/common/wakubridge.nim
@@ -42,7 +42,7 @@ proc startWakuV1(config: WakuNodeConf, rng: ref BrHmacDrbgContext):
                   udpPort: Port(config.udpPort + config.portsShift))
 
   # Set-up node
-  var node = newEthereumNode(config.nodekeyv1, address, 1, nil, clientIdV1,
+  var node = newEthereumNode(config.nodekeyv1, address, NetworkId(1), nil, clientIdV1,
     addAllCapabilities = false, rng = rng)
   node.addCapability Waku # Always enable Waku protocol
   # Set up the Waku configuration.
diff --git a/waku/v1/node/wakunode1.nim b/waku/v1/node/wakunode1.nim
index b084b71e2..a98163f3b 100644
--- a/waku/v1/node/wakunode1.nim
+++ b/waku/v1/node/wakunode1.nim
@@ -27,7 +27,7 @@ proc run(config: WakuNodeConf, rng: ref BrHmacDrbgContext) =
                   udpPort: Port(config.udpPort + config.portsShift))
 
   # Set-up node
-  var node = newEthereumNode(config.nodekey, address, 1, nil, clientId,
+  var node = newEthereumNode(config.nodekey, address, NetworkId(1), nil, clientId,
     addAllCapabilities = false, rng = rng)
   if not config.bootnodeOnly:
     node.addCapability Waku # Always enable Waku protocol