fixing shards validation

waku/factory/external_config.nim

@@ -312,8 +312,9 @@ type WakuNodeConf* = object
       name: "keep-alive"
     .}: bool
 
-    networkShards* {.desc: "Number of shards in the network", name: "network-shards".}:
-      uint32
+    networkShards* {.
+      desc: "Number of shards in the network", defaultValue: 0, name: "network-shards"
+    .}: uint32
 
     pubsubTopics* {.
       desc:

waku/factory/node_factory.nim

@@ -117,7 +117,7 @@ proc getNetworkShards*(conf: WakuNodeConf): uint32 =
   if conf.networkShards != 0:
     return conf.networkShards
   # If conf.networkShards is not set, use the number of shards configured as networkShards
-  return uint32(conf.shards.len)
+  return uint32(max(conf.shards) + 1)
 
 proc setupProtocols(
     node: WakuNode, conf: WakuNodeConf, nodeKey: crypto.PrivateKey

waku/factory/waku.nim

@@ -116,6 +116,11 @@ proc init*(T: type Waku, conf: WakuNodeConf): Result[Waku, string] =
 
     if shardsOpt.isSome():
       let relayShards = shardsOpt.get()
+      if relayShards.clusterId != conf.clusterId:
+        error "clusterId of the pubsub topic should match the node's cluster",
+          nodeCluster = conf.clusterId, pubsubCluster = relayShards.clusterId
+        return err("clusterId of the pubsub topic should match the node's cluster")
+
       for shard in relayShards.shardIds:
         shards.add(shard)
       confCopy.shards = shards
@@ -149,7 +154,7 @@ proc init*(T: type Waku, conf: WakuNodeConf): Result[Waku, string] =
   info "Running nwaku node", version = git_version
   logConfig(confCopy)
 
-  let validateShardsRes = validateShards(conf)
+  let validateShardsRes = validateShards(confCopy)
   if validateShardsRes.isErr():
     error "Failed validating shards", error = $validateShardsRes.error
     return err("Failed validating shards: " & $validateShardsRes.error)